chore: update iced

pop-os · Dec 4, 2023 · abb7656 · abb7656
1 parent 5fe4ece
commit abb7656
Show file tree

Hide file tree

Showing 13 changed files with 85 additions and 99 deletions.
diff --git a/examples/cosmic/Cargo.toml b/examples/cosmic/Cargo.toml
@@ -14,8 +14,8 @@ slotmap = "1.0.6"
 env_logger = "0.10"
 log = "0.4.17"
 
-[dependencies.cosmic-time]
-git = "https://github.com/pop-os/cosmic-time"
-default-features = false
-branch = "update-0.12"
-features = ["libcosmic", "once_cell"]
+# [dependencies.cosmic-time]
+# git = "https://github.com/pop-os/cosmic-time"
+# default-features = false
+# branch = "update-0.12"
+# features = ["libcosmic", "once_cell"]
diff --git a/examples/cosmic/src/window.rs b/examples/cosmic/src/window.rs
@@ -22,7 +22,7 @@ use cosmic::{
     },
     Element,
 };
-use cosmic_time::{Instant, Timeline};
+// use cosmic_time::{Instant, Timeline};
 use std::{
     cell::RefCell,
     rc::Rc,
@@ -166,7 +166,7 @@ pub struct Window {
     warning_message: String,
     scale_factor: f64,
     scale_factor_string: String,
-    timeline: Rc<RefCell<Timeline>>,
+    // timeline: Rc<RefCell<Timeline>>,
 }
 
 impl Window {
@@ -211,7 +211,7 @@ pub enum Message {
     ToggleNavBarCondensed,
     ToggleWarning,
     FontsLoaded,
-    Tick(Instant),
+    // Tick(Instant),
 }
 
 impl From<Page> for Message {
@@ -349,7 +349,7 @@ impl Application for Window {
         window.insert_page(Page::TimeAndLanguage(None));
         window.insert_page(Page::Accessibility);
         window.insert_page(Page::Applications);
-        window.demo.timeline = window.timeline.clone();
+        // window.demo.timeline = window.timeline.clone();
 
         (window, load_fonts().map(|_| Message::FontsLoaded))
     }
@@ -381,10 +381,10 @@ impl Application for Window {
         Subscription::batch(vec![
             window_break.map(|_| Message::CondensedViewToggle),
             keyboard_nav::subscription().map(Message::KeyboardNav),
-            self.timeline
-                .borrow()
-                .as_subscription()
-                .map(|(_, instant)| Self::Message::Tick(instant)),
+            // self.timeline
+            //     .borrow()
+            //     .as_subscription()
+            //     .map(|(_, instant)| Self::Message::Tick(instant)),
         ])
     }
 
@@ -452,7 +452,7 @@ impl Application for Window {
             },
             Message::ToggleWarning => self.toggle_warning(),
             Message::FontsLoaded => {} // Message::Tick(instant) => self.timeline.borrow_mut().now(instant),            Message::Tick(instant) => self.timeline.borrow_mut().now(instant),
-            Message::Tick(instant) => self.timeline.borrow_mut().now(instant),
+            // Message::Tick(instant) => self.timeline.borrow_mut().now(instant),
         }
         ret
     }

diff --git a/examples/cosmic/src/window/demo.rs b/examples/cosmic/src/window/demo.rs
@@ -14,13 +14,13 @@ use cosmic::{
     },
     Element,
 };
-use cosmic_time::{anim, chain, Timeline};
+// use cosmic_time::{anim, chain, Timeline};
 use fraction::{Decimal, ToPrimitive};
 use once_cell::sync::Lazy;
 
 use super::{Page, Window};
 
-static CARDS: Lazy<cosmic_time::id::Cards> = Lazy::new(cosmic_time::id::Cards::unique);
+// static CARDS: Lazy<cosmic_time::id::Cards> = Lazy::new(cosmic_time::id::Cards::unique);
 
 #[derive(Clone, Copy, Debug, PartialEq, PartialOrd, Ord, Eq)]
 pub enum ThemeVariant {
@@ -113,7 +113,7 @@ pub struct State {
     pub entry_value: String,
     pub cards_value: bool,
     cards: Vec<String>,
-    pub timeline: Rc<RefCell<Timeline>>,
+    // pub timeline: Rc<RefCell<Timeline>>,
     pub color_picker_model: ColorPickerModel,
 }
 
@@ -160,7 +160,7 @@ impl Default for State {
                 "card 3".to_string(),
                 "card 4".to_string(),
             ],
-            timeline: Rc::new(RefCell::new(Default::default())),
+            // timeline: Rc::new(RefCell::new(Default::default())),
             color_picker_model: ColorPickerModel::new("Hex", "RGB", None, None),
         }
     }
@@ -243,7 +243,7 @@ impl State {
 
         let choose_icon_theme =
             segmented_selection::horizontal(&self.icon_themes).on_activate(Message::IconTheme);
-        let timeline = self.timeline.borrow();
+        // let timeline = self.timeline.borrow();
         settings::view_column(vec![
             window.page_title(Page::Demo),
             view_switcher::horizontal(&self.view_switcher)
@@ -445,79 +445,37 @@ impl State {
                 .padding(8)
                 .width(Length::Fill)
                 .into(),
-            container(anim!(
-                //cards
-                CARDS,
-                &timeline,
-                self.cards
-                    .iter()
-                    .enumerate()
-                    .map(|(i, c)| column![
-                        button::text("Delete me").on_press(Message::DeleteCard(i)),
-                        text(c).size(24).width(Length::Fill)
-                    ]
-                    .into())
-                    .collect(),
-                Message::ClearAll,
-                |_, e| Message::CardsToggled(e),
-                "Show More",
-                "Show Less",
-                "Clear All",
-                None,
-                self.cards_value,
-            ))
-            .layer(cosmic::cosmic_theme::Layer::Secondary)
-            .padding(16)
-            .style(cosmic::theme::Container::Background)
-            .into(),
+            // container(anim!(
+            //     //cards
+            //     CARDS,
+            //     &timeline,
+            //     self.cards
+            //         .iter()
+            //         .enumerate()
+            //         .map(|(i, c)| column![
+            //             button::text("Delete me").on_press(Message::DeleteCard(i)),
+            //             text(c).size(24).width(Length::Fill)
+            //         ]
+            //         .into())
+            //         .collect(),
+            //     Message::ClearAll,
+            //     |_, e| Message::CardsToggled(e),
+            //     "Show More",
+            //     "Show Less",
+            //     "Clear All",
+            //     None,
+            //     self.cards_value,
+            // ))
+            // .layer(cosmic::cosmic_theme::Layer::Secondary)
+            // .padding(16)
+            // .style(cosmic::theme::Container::Background)
+            // .into(),
             text_input(
                 "Type to search apps or type “?” for more options...",
                 &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))
@@ -539,13 +497,13 @@ impl State {
     }
 
     fn update_cards(&mut self) {
-        let mut timeline = self.timeline.borrow_mut();
-        let chain = if self.cards_value {
-            chain::Cards::on(CARDS.clone(), 1.)
-        } else {
-            chain::Cards::off(CARDS.clone(), 1.)
-        };
-        timeline.set_chain(chain);
-        timeline.start();
+        // let mut timeline = self.timeline.borrow_mut();
+        // let chain = if self.cards_value {
+        //     chain::Cards::on(CARDS.clone(), 1.)
+        // } else {
+        //     chain::Cards::off(CARDS.clone(), 1.)
+        // };
+        // timeline.set_chain(chain);
+        // timeline.start();
     }
 }
diff --git a/iced b/iced
diff --git 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
@@ -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,
             );
         }
     }

diff --git a/src/widget/dropdown/multi/menu.rs b/src/widget/dropdown/multi/menu.rs
@@ -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,
                     );
                 }
             }

diff --git a/src/widget/dropdown/multi/widget.rs b/src/widget/dropdown/multi/widget.rs
@@ -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,
         );
     }
 }
diff --git a/src/widget/dropdown/widget.rs b/src/widget/dropdown/widget.rs
@@ -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,
         );
     }
 }
diff --git 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::<MenuBarState>();
         let overlay_offset = Point::ORIGIN - position;

diff --git a/src/widget/popover.rs b/src/widget/popover.rs
@@ -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