From fcfe9ebc5978063c7ff9d4fb0f0b3f036c3f0b55 Mon Sep 17 00:00:00 2001 From: Ashley Wulber Date: Mon, 4 Dec 2023 16:49:14 -0500 Subject: [PATCH] chore: update iced --- examples/cosmic/src/window/demo.rs | 40 --------------------------- iced | 2 +- src/widget/context_drawer/overlay.rs | 1 + src/widget/dropdown/menu/mod.rs | 2 ++ src/widget/dropdown/multi/menu.rs | 3 ++ src/widget/dropdown/multi/widget.rs | 5 +++- src/widget/dropdown/widget.rs | 5 +++- src/widget/menu/menu_inner.rs | 8 +++++- src/widget/popover.rs | 8 +++++- src/widget/segmented_button/widget.rs | 1 + src/widget/text_input/input.rs | 3 ++ 11 files changed, 33 insertions(+), 45 deletions(-) diff --git a/examples/cosmic/src/window/demo.rs b/examples/cosmic/src/window/demo.rs index 824b243..6329dd3 100644 --- a/examples/cosmic/src/window/demo.rs +++ b/examples/cosmic/src/window/demo.rs @@ -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)) diff --git a/iced b/iced index d67f1a1..33b2fd9 160000 --- a/iced +++ b/iced @@ -1 +1 @@ -Subproject commit d67f1a1c79cf3dcb378520ef7e4e9ab653f75bea +Subproject commit 33b2fd967ada2d2c86eb1b57eb4997719774499e diff --git a/src/widget/context_drawer/overlay.rs b/src/widget/context_drawer/overlay.rs index f2a2bc7..412da48 100644 --- a/src/widget/context_drawer/overlay.rs +++ b/src/widget/context_drawer/overlay.rs @@ -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) diff --git a/src/widget/dropdown/menu/mod.rs b/src/widget/dropdown/menu/mod.rs index 5c5f490..192a76e 100644 --- a/src/widget/dropdown/menu/mod.rs +++ b/src/widget/dropdown/menu/mod.rs @@ -192,6 +192,7 @@ impl<'a, Message> iced_core::Overlay 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, Message> Widget for List<'a, S }, bounds.position(), color, + *viewport, ); } } diff --git a/src/widget/dropdown/multi/menu.rs b/src/widget/dropdown/multi/menu.rs index aac0010..cf5f528 100644 --- a/src/widget/dropdown/multi/menu.rs +++ b/src/widget/dropdown/multi/menu.rs @@ -195,6 +195,7 @@ impl<'a, Message> iced_core::Overlay 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, ); } } diff --git a/src/widget/dropdown/multi/widget.rs b/src/widget/dropdown/multi/widget.rs index 3f59fcc..8b00f4d 100644 --- a/src/widget/dropdown/multi/widget.rs +++ b/src/widget/dropdown/multi/widget.rs @@ -147,7 +147,7 @@ impl<'a, S: AsRef, 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, Message: 'a, Item: Clone + PartialEq + 'static> .as_ref() .and_then(|id| self.selections.get(id)), tree.state.downcast_ref::>(), + 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, + viewport: &Rectangle, ) where S: AsRef + 'a, { @@ -547,6 +549,7 @@ pub fn draw<'a, S, Item: Clone + PartialEq + 'static>( }, bounds.position(), style.text_color, + *viewport, ); } } diff --git a/src/widget/dropdown/widget.rs b/src/widget/dropdown/widget.rs index 3730609..11fbbeb 100644 --- a/src/widget/dropdown/widget.rs +++ b/src/widget/dropdown/widget.rs @@ -192,7 +192,7 @@ impl<'a, S: AsRef, Message: 'a> Widget 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, Message: 'a> Widget for Dropdo font, self.selected.and_then(|id| self.selections.get(id)), tree.state.downcast_ref::(), + 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 + 'a, { @@ -538,6 +540,7 @@ pub fn draw<'a, S>( }, bounds.position(), style.text_color, + *viewport, ); } } diff --git a/src/widget/menu/menu_inner.rs b/src/widget/menu/menu_inner.rs index 4c748f3..68dfd35 100644 --- a/src/widget/menu/menu_inner.rs +++ b/src/widget/menu/menu_inner.rs @@ -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::(); let overlay_offset = Point::ORIGIN - position; diff --git a/src/widget/popover.rs b/src/widget/popover.rs index 41a6e5c..9617395 100644 --- a/src/widget/popover.rs +++ b/src/widget/popover.rs @@ -209,7 +209,13 @@ impl<'a, 'b, Message, Renderer> overlay::Overlay 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 diff --git a/src/widget/segmented_button/widget.rs b/src/widget/segmented_button/widget.rs index d2847c4..e619750 100644 --- a/src/widget/segmented_button/widget.rs +++ b/src/widget/segmented_button/widget.rs @@ -644,6 +644,7 @@ where }, bounds.position(), status_appearance.text_color, + *viewport, ); } diff --git a/src/widget/text_input/input.rs b/src/widget/text_input/input.rs index 3146818..02386a0 100644 --- a/src/widget/text_input/input.rs +++ b/src/widget/text_input/input.rs @@ -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, ); } }