chore: update iced
This commit is contained in:
parent
17bc373990
commit
fcfe9ebc59
11 changed files with 33 additions and 45 deletions
|
|
@ -475,49 +475,9 @@ impl State {
|
||||||
&self.entry_value,
|
&self.entry_value,
|
||||||
)
|
)
|
||||||
.on_input(Message::InputChanged)
|
.on_input(Message::InputChanged)
|
||||||
// .on_submit(Message::Activate(None))
|
|
||||||
.size(20)
|
.size(20)
|
||||||
.id(INPUT_ID.clone())
|
.id(INPUT_ID.clone())
|
||||||
.into(),
|
.into(),
|
||||||
cosmic::widget::text_input("test", &self.entry_value)
|
|
||||||
.on_clear(Message::InputChanged("".to_string()))
|
|
||||||
.width(Length::Fill)
|
|
||||||
.on_input(Message::InputChanged)
|
|
||||||
.into(),
|
|
||||||
cosmic::widget::text_input("test", &self.entry_value)
|
|
||||||
.width(Length::Fixed(600.0))
|
|
||||||
.padding(32)
|
|
||||||
.on_input(Message::InputChanged)
|
|
||||||
.into(),
|
|
||||||
cosmic::widget::search_input("test", &self.entry_value)
|
|
||||||
.on_clear(Message::InputChanged("".to_string()))
|
|
||||||
.width(Length::Fill)
|
|
||||||
.on_input(Message::InputChanged)
|
|
||||||
.into(),
|
|
||||||
cosmic::widget::text_input("test", &self.entry_value)
|
|
||||||
.width(Length::Fixed(600.0))
|
|
||||||
.on_input(Message::InputChanged)
|
|
||||||
.into(),
|
|
||||||
cosmic::widget::search_input("test", &self.entry_value)
|
|
||||||
.width(Length::Fixed(100.0))
|
|
||||||
.on_input(Message::InputChanged)
|
|
||||||
.into(),
|
|
||||||
cosmic::widget::search_input("test", &self.entry_value)
|
|
||||||
.on_clear(Message::InputChanged("".to_string()))
|
|
||||||
.padding([24, 48])
|
|
||||||
.width(Length::Fixed(400.0))
|
|
||||||
.on_input(Message::InputChanged)
|
|
||||||
.into(),
|
|
||||||
cosmic::widget::search_input("test", &self.entry_value)
|
|
||||||
.on_clear(Message::InputChanged("".to_string()))
|
|
||||||
.width(Length::Fixed(400.0))
|
|
||||||
.on_input(Message::InputChanged)
|
|
||||||
.into(),
|
|
||||||
cosmic::widget::search_input("test", &self.entry_value)
|
|
||||||
.on_clear(Message::InputChanged("".to_string()))
|
|
||||||
.width(Length::Fixed(800.0))
|
|
||||||
.on_input(Message::InputChanged)
|
|
||||||
.into(),
|
|
||||||
self.color_picker_model
|
self.color_picker_model
|
||||||
.picker_button(Message::ColorPickerUpdate, None)
|
.picker_button(Message::ColorPickerUpdate, None)
|
||||||
.width(Length::Fixed(128.0))
|
.width(Length::Fixed(128.0))
|
||||||
|
|
|
||||||
2
iced
2
iced
|
|
@ -1 +1 @@
|
||||||
Subproject commit d67f1a1c79cf3dcb378520ef7e4e9ab653f75bea
|
Subproject commit 33b2fd967ada2d2c86eb1b57eb4997719774499e
|
||||||
|
|
@ -25,6 +25,7 @@ where
|
||||||
renderer: &crate::Renderer,
|
renderer: &crate::Renderer,
|
||||||
bounds: Size,
|
bounds: Size,
|
||||||
position: Point,
|
position: Point,
|
||||||
|
_translation: iced::Vector,
|
||||||
) -> layout::Node {
|
) -> layout::Node {
|
||||||
let limits = layout::Limits::new(Size::ZERO, bounds)
|
let limits = layout::Limits::new(Size::ZERO, bounds)
|
||||||
.width(self.width)
|
.width(self.width)
|
||||||
|
|
|
||||||
|
|
@ -192,6 +192,7 @@ impl<'a, Message> iced_core::Overlay<Message, crate::Renderer> for Overlay<'a, M
|
||||||
renderer: &crate::Renderer,
|
renderer: &crate::Renderer,
|
||||||
bounds: Size,
|
bounds: Size,
|
||||||
position: Point,
|
position: Point,
|
||||||
|
_translation: iced::Vector,
|
||||||
) -> layout::Node {
|
) -> layout::Node {
|
||||||
let space_below = bounds.height - (position.y + self.target_height);
|
let space_below = bounds.height - (position.y + self.target_height);
|
||||||
let space_above = position.y;
|
let space_above = position.y;
|
||||||
|
|
@ -514,6 +515,7 @@ impl<'a, S: AsRef<str>, Message> Widget<Message, crate::Renderer> for List<'a, S
|
||||||
},
|
},
|
||||||
bounds.position(),
|
bounds.position(),
|
||||||
color,
|
color,
|
||||||
|
*viewport,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -195,6 +195,7 @@ impl<'a, Message> iced_core::Overlay<Message, crate::Renderer> for Overlay<'a, M
|
||||||
renderer: &crate::Renderer,
|
renderer: &crate::Renderer,
|
||||||
bounds: Size,
|
bounds: Size,
|
||||||
position: Point,
|
position: Point,
|
||||||
|
_translation: iced::Vector,
|
||||||
) -> layout::Node {
|
) -> layout::Node {
|
||||||
let space_below = bounds.height - (position.y + self.target_height);
|
let space_below = bounds.height - (position.y + self.target_height);
|
||||||
let space_above = position.y;
|
let space_above = position.y;
|
||||||
|
|
@ -603,6 +604,7 @@ where
|
||||||
},
|
},
|
||||||
bounds.position(),
|
bounds.position(),
|
||||||
color,
|
color,
|
||||||
|
*viewport,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -651,6 +653,7 @@ where
|
||||||
},
|
},
|
||||||
bounds.position(),
|
bounds.position(),
|
||||||
appearance.description_color,
|
appearance.description_color,
|
||||||
|
*viewport,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -147,7 +147,7 @@ impl<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static>
|
||||||
_style: &iced_core::renderer::Style,
|
_style: &iced_core::renderer::Style,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
cursor: mouse::Cursor,
|
cursor: mouse::Cursor,
|
||||||
_viewport: &Rectangle,
|
viewport: &Rectangle,
|
||||||
) {
|
) {
|
||||||
let font = self
|
let font = self
|
||||||
.font
|
.font
|
||||||
|
|
@ -168,6 +168,7 @@ impl<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static>
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.and_then(|id| self.selections.get(id)),
|
.and_then(|id| self.selections.get(id)),
|
||||||
tree.state.downcast_ref::<State<Item>>(),
|
tree.state.downcast_ref::<State<Item>>(),
|
||||||
|
viewport,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -486,6 +487,7 @@ pub fn draw<'a, S, Item: Clone + PartialEq + 'static>(
|
||||||
font: crate::font::Font,
|
font: crate::font::Font,
|
||||||
selected: Option<&'a S>,
|
selected: Option<&'a S>,
|
||||||
state: &'a State<Item>,
|
state: &'a State<Item>,
|
||||||
|
viewport: &Rectangle,
|
||||||
) where
|
) where
|
||||||
S: AsRef<str> + 'a,
|
S: AsRef<str> + 'a,
|
||||||
{
|
{
|
||||||
|
|
@ -547,6 +549,7 @@ pub fn draw<'a, S, Item: Clone + PartialEq + 'static>(
|
||||||
},
|
},
|
||||||
bounds.position(),
|
bounds.position(),
|
||||||
style.text_color,
|
style.text_color,
|
||||||
|
*viewport,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -192,7 +192,7 @@ impl<'a, S: AsRef<str>, Message: 'a> Widget<Message, crate::Renderer> for Dropdo
|
||||||
_style: &iced_core::renderer::Style,
|
_style: &iced_core::renderer::Style,
|
||||||
layout: Layout<'_>,
|
layout: Layout<'_>,
|
||||||
cursor: mouse::Cursor,
|
cursor: mouse::Cursor,
|
||||||
_viewport: &Rectangle,
|
viewport: &Rectangle,
|
||||||
) {
|
) {
|
||||||
let font = self
|
let font = self
|
||||||
.font
|
.font
|
||||||
|
|
@ -209,6 +209,7 @@ impl<'a, S: AsRef<str>, Message: 'a> Widget<Message, crate::Renderer> for Dropdo
|
||||||
font,
|
font,
|
||||||
self.selected.and_then(|id| self.selections.get(id)),
|
self.selected.and_then(|id| self.selections.get(id)),
|
||||||
tree.state.downcast_ref::<State>(),
|
tree.state.downcast_ref::<State>(),
|
||||||
|
viewport,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -479,6 +480,7 @@ pub fn draw<'a, S>(
|
||||||
font: crate::font::Font,
|
font: crate::font::Font,
|
||||||
selected: Option<&'a S>,
|
selected: Option<&'a S>,
|
||||||
state: &'a State,
|
state: &'a State,
|
||||||
|
viewport: &Rectangle,
|
||||||
) where
|
) where
|
||||||
S: AsRef<str> + 'a,
|
S: AsRef<str> + 'a,
|
||||||
{
|
{
|
||||||
|
|
@ -538,6 +540,7 @@ pub fn draw<'a, S>(
|
||||||
},
|
},
|
||||||
bounds.position(),
|
bounds.position(),
|
||||||
style.text_color,
|
style.text_color,
|
||||||
|
*viewport,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -466,7 +466,13 @@ where
|
||||||
Renderer: renderer::Renderer,
|
Renderer: renderer::Renderer,
|
||||||
Renderer::Theme: StyleSheet,
|
Renderer::Theme: StyleSheet,
|
||||||
{
|
{
|
||||||
fn layout(&mut self, renderer: &Renderer, bounds: Size, position: Point) -> Node {
|
fn layout(
|
||||||
|
&mut self,
|
||||||
|
renderer: &Renderer,
|
||||||
|
bounds: Size,
|
||||||
|
position: Point,
|
||||||
|
_translation: iced::Vector,
|
||||||
|
) -> Node {
|
||||||
// layout children
|
// layout children
|
||||||
let state = self.tree.state.downcast_mut::<MenuBarState>();
|
let state = self.tree.state.downcast_mut::<MenuBarState>();
|
||||||
let overlay_offset = Point::ORIGIN - position;
|
let overlay_offset = Point::ORIGIN - position;
|
||||||
|
|
|
||||||
|
|
@ -209,7 +209,13 @@ impl<'a, 'b, Message, Renderer> overlay::Overlay<Message, Renderer>
|
||||||
where
|
where
|
||||||
Renderer: iced_core::Renderer,
|
Renderer: iced_core::Renderer,
|
||||||
{
|
{
|
||||||
fn layout(&mut self, renderer: &Renderer, bounds: Size, mut position: Point) -> layout::Node {
|
fn layout(
|
||||||
|
&mut self,
|
||||||
|
renderer: &Renderer,
|
||||||
|
bounds: Size,
|
||||||
|
mut position: Point,
|
||||||
|
_translation: iced::Vector,
|
||||||
|
) -> layout::Node {
|
||||||
let limits = layout::Limits::new(Size::UNIT, bounds);
|
let limits = layout::Limits::new(Size::UNIT, bounds);
|
||||||
let mut node = self
|
let mut node = self
|
||||||
.content
|
.content
|
||||||
|
|
|
||||||
|
|
@ -644,6 +644,7 @@ where
|
||||||
},
|
},
|
||||||
bounds.position(),
|
bounds.position(),
|
||||||
status_appearance.text_color,
|
status_appearance.text_color,
|
||||||
|
*viewport,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1904,6 +1904,7 @@ pub fn draw<'a, Message>(
|
||||||
},
|
},
|
||||||
bounds.position(),
|
bounds.position(),
|
||||||
appearance.label_color,
|
appearance.label_color,
|
||||||
|
*viewport,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
let mut child_index = 0;
|
let mut child_index = 0;
|
||||||
|
|
@ -2044,6 +2045,7 @@ pub fn draw<'a, Message>(
|
||||||
},
|
},
|
||||||
bounds.position(),
|
bounds.position(),
|
||||||
color,
|
color,
|
||||||
|
*viewport,
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -2091,6 +2093,7 @@ pub fn draw<'a, Message>(
|
||||||
},
|
},
|
||||||
helper_text_layout.bounds().position(),
|
helper_text_layout.bounds().position(),
|
||||||
appearance.text_color,
|
appearance.text_color,
|
||||||
|
*viewport,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue