leyoda/libcosmic-yoda
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: update iced

Browse source
This commit is contained in:
Ashley Wulber 2023-12-04 16:49:14 -05:00 • committed by Ashley Wulber
parent 17bc373990
commit fcfe9ebc59
11 changed files with 33 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

40
examples/cosmic/src/window/demo.rs
View file

@ -475,49 +475,9 @@ impl State {
&self.entry_value,
)
.on_input(Message::InputChanged)
// .on_submit(Message::Activate(None))
.size(20)
.id(INPUT_ID.clone())
.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
.picker_button(Message::ColorPickerUpdate, None)
.width(Length::Fixed(128.0))

2
iced

@ -1 +1 @@
Subproject commit d67f1a1c79cf3dcb378520ef7e4e9ab653f75bea
Subproject commit 33b2fd967ada2d2c86eb1b57eb4997719774499e

1
src/widget/context_drawer/overlay.rs
View file

@ -25,6 +25,7 @@ where
renderer: &crate::Renderer,
bounds: Size,
position: Point,
_translation: iced::Vector,
) -> layout::Node {
let limits = layout::Limits::new(Size::ZERO, bounds)
.width(self.width)

2
src/widget/dropdown/menu/mod.rs
View file

@ -192,6 +192,7 @@ impl<'a, Message> iced_core::Overlay<Message, crate::Renderer> for Overlay<'a, M
renderer: &crate::Renderer,
bounds: Size,
position: Point,
_translation: iced::Vector,
) -> layout::Node {
let space_below = bounds.height - (position.y + self.target_height);
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(),
color,
*viewport,
);
}
}

3
src/widget/dropdown/multi/menu.rs
View file

@ -195,6 +195,7 @@ impl<'a, Message> iced_core::Overlay<Message, crate::Renderer> for Overlay<'a, M
renderer: &crate::Renderer,
bounds: Size,
position: Point,
_translation: iced::Vector,
) -> layout::Node {
let space_below = bounds.height - (position.y + self.target_height);
let space_above = position.y;
@ -603,6 +604,7 @@ where
},
bounds.position(),
color,
*viewport,
);
}
@ -651,6 +653,7 @@ where
},
bounds.position(),
appearance.description_color,
*viewport,
);
}
}

5
src/widget/dropdown/multi/widget.rs
View file

@ -147,7 +147,7 @@ impl<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static>
_style: &iced_core::renderer::Style,
layout: Layout<'_>,
cursor: mouse::Cursor,
_viewport: &Rectangle,
viewport: &Rectangle,
) {
let font = self
.font
@ -168,6 +168,7 @@ impl<'a, S: AsRef<str>, Message: 'a, Item: Clone + PartialEq + 'static>
.as_ref()
.and_then(|id| self.selections.get(id)),
tree.state.downcast_ref::<State<Item>>(),
viewport,
);
}
@ -486,6 +487,7 @@ pub fn draw<'a, S, Item: Clone + PartialEq + 'static>(
font: crate::font::Font,
selected: Option<&'a S>,
state: &'a State<Item>,
viewport: &Rectangle,
) where
S: AsRef<str> + 'a,
{
@ -547,6 +549,7 @@ pub fn draw<'a, S, Item: Clone + PartialEq + 'static>(
},
bounds.position(),
style.text_color,
*viewport,
);
}
}

5
src/widget/dropdown/widget.rs
View file

@ -192,7 +192,7 @@ impl<'a, S: AsRef<str>, Message: 'a> Widget<Message, crate::Renderer> for Dropdo
_style: &iced_core::renderer::Style,
layout: Layout<'_>,
cursor: mouse::Cursor,
_viewport: &Rectangle,
viewport: &Rectangle,
) {
let font = self
.font
@ -209,6 +209,7 @@ impl<'a, S: AsRef<str>, Message: 'a> Widget<Message, crate::Renderer> for Dropdo
font,
self.selected.and_then(|id| self.selections.get(id)),
tree.state.downcast_ref::<State>(),
viewport,
);
}
@ -479,6 +480,7 @@ pub fn draw<'a, S>(
font: crate::font::Font,
selected: Option<&'a S>,
state: &'a State,
viewport: &Rectangle,
) where
S: AsRef<str> + 'a,
{
@ -538,6 +540,7 @@ pub fn draw<'a, S>(
},
bounds.position(),
style.text_color,
*viewport,
);
}
}

8
src/widget/menu/menu_inner.rs
View file

@ -466,7 +466,13 @@ where
Renderer: renderer::Renderer,
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
let state = self.tree.state.downcast_mut::<MenuBarState>();
let overlay_offset = Point::ORIGIN - position;

8
src/widget/popover.rs
View file

@ -209,7 +209,13 @@ impl<'a, 'b, Message, Renderer> overlay::Overlay<Message, Renderer>
where
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 mut node = self
.content

1
src/widget/segmented_button/widget.rs
View file

@ -644,6 +644,7 @@ where
},
bounds.position(),
status_appearance.text_color,
*viewport,
);
}

3
src/widget/text_input/input.rs
View file

@ -1904,6 +1904,7 @@ pub fn draw<'a, Message>(
},
bounds.position(),
appearance.label_color,
*viewport,
);
}
let mut child_index = 0;
@ -2044,6 +2045,7 @@ pub fn draw<'a, Message>(
},
bounds.position(),
color,
*viewport,
);
};
@ -2091,6 +2093,7 @@ pub fn draw<'a, Message>(
},
helper_text_layout.bounds().position(),
appearance.text_color,
*viewport,
);
}
}