refactor: more dropdown popups

Author: wash2

Cargo.lock

@@ -57,12 +57,12 @@ cosmic-client-toolkit = { git = "https://github.com/pop-os/cosmic-protocols//",
 
 # For development and testing purposes
 [patch.'https://github.com/pop-os/libcosmic']
-# libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" }
-# cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" }
-# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "fontconfig" }
-libcosmic = { path = "../libcosmic" }
-cosmic-config = { path = "../libcosmic/cosmic-config" }
-cosmic-theme = { path = "../libcosmic/cosmic-theme" }
+libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "drop-menu-tree-changes" }
+cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "drop-menu-tree-changes" }
+cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "drop-menu-tree-changes" }
+# libcosmic = { path = "../libcosmic" }
+# cosmic-config = { path = "../libcosmic/cosmic-config" }
+# cosmic-theme = { path = "../libcosmic/cosmic-theme" }
 
 # [patch.'https://github.com/pop-os/dbus-settings-bindings']
 # cosmic-dbus-networkmanager = { path = "../dbus-settings-bindings/networkmanager" }

Cargo.toml

@@ -573,7 +573,9 @@ impl cosmic::Application for SettingsApp {
 
                 #[cfg(feature = "page-power")]
                 crate::pages::Message::Power(message) => {
-                    page::update!(self.pages, message, power::Page);
+                    if let Some(page) = self.pages.page_mut::<power::Page>() {
+                        return page.update(message).map(Into::into);
+                    }
                 }
 
                 #[cfg(feature = "page-networking")]

cosmic-settings/src/app.rs

@@ -3,6 +3,7 @@ use std::collections::HashSet;
 use cosmic::{
     iced::{Element, Length},
     iced_core::text::Wrapping,
+    surface,
     widget::{self, icon, settings, svg, text},
     Apply,
 };
@@ -39,6 +40,7 @@ pub enum Message {
     SetIncrement(usize),
     SetSignin(bool),
     SetMovement(ZoomMovement),
+    Surface(surface::Action),
 }
 
 impl Default for Page {
@@ -184,14 +186,26 @@ pub fn magnifier() -> section::Section<crate::pages::Message> {
                             widget::toggler(page.magnifier_state).on_toggle(Message::SetMagnifier),
                         ),
                 )
-                .add(settings::item(
-                    &descriptions[increment],
-                    widget::dropdown(
+                .add(settings::item(&descriptions[increment], {
+                    let dropdown = widget::dropdown(
                         &page.increment_values,
                         page.increment_idx,
                         Message::SetIncrement,
-                    ),
-                ))
+                    );
+                    #[cfg(feature = "wayland")]
+                    let dropdown = {
+                        dropdown.with_popup(
+                            cosmic::iced::window::Id::RESERVED,
+                            Message::Surface,
+                            |a| {
+                                crate::app::Message::PageMessage(
+                                    crate::pages::Message::AccessibilityMagnifier(a),
+                                )
+                            },
+                        )
+                    };
+                    dropdown
+                }))
                 .add(settings::item(
                     &descriptions[signin],
                     widget::toggler(page.zoom_config.start_on_login).on_toggle(Message::SetSignin),
@@ -332,6 +346,9 @@ impl Page {
                     ));
                 }
             }
+            Message::Surface(a) => {
+                return cosmic::task::message(crate::app::Message::Surface(a));
+            }
         }
 
         cosmic::iced::Task::none()

cosmic-settings/src/pages/accessibility/magnifier.rs

@@ -66,12 +66,17 @@ impl Page {
 
                 Task::none()
             }
-            Message::Inner(inner) => self
-                .inner
-                .update(inner)
-                .map(Message::Inner)
-                .map(crate::pages::Message::Dock)
-                .map(crate::app::Message::PageMessage),
+            Message::Inner(inner) => {
+                if let inner::Message::Surface(a) = inner {
+                    return cosmic::task::message(crate::app::Message::Surface(a));
+                } else {
+                    self.inner
+                        .update(inner)
+                        .map(Message::Inner)
+                        .map(crate::pages::Message::Dock)
+                        .map(crate::app::Message::PageMessage)
+                }
+            }
         }
     }
 }