feat(applets): add overflow support

iced

@@ -1 +1 @@
-Subproject commit 26a8598b393d90fbad113551cdfc4fc9e7ef259b
+Subproject commit fd3d7c72bd19b4ee425e02649851b71391843c64

src/app/cosmic.rs

@@ -84,6 +84,9 @@ pub enum Message {
     Focus(window::Id),
     /// Window focus lost
     Unfocus(window::Id),
+    /// Tracks updates to window suggested size.
+    #[cfg(feature = "applet")]
+    Configure(cctk::sctk::shell::xdg::window::WindowConfigure),
 }
 
 #[derive(Default)]
@@ -186,6 +189,12 @@ where
                     | wayland::Event::Layer(wayland::LayerEvent::Done, _, id) => {
                         return Some(Message::SurfaceClosed(id));
                     }
+                    #[cfg(feature = "applet")]
+                    wayland::Event::Window(WindowEvent::Configure(conf), _surface, id)
+                        if id == window::Id::MAIN =>
+                    {
+                        return Some(Message::Configure(conf));
+                    }
                     _ => (),
                 },
                 _ => (),
@@ -638,6 +647,16 @@ impl<T: Application> Cosmic<T> {
                     core.focused_window = None;
                 }
             }
+            #[cfg(feature = "applet")]
+            Message::Configure(configure) => {
+                if let Some(w) = configure.new_size.0 {
+                    self.app.core_mut().set_window_width(w.get());
+                }
+                if let Some(h) = configure.new_size.1 {
+                    self.app.core_mut().set_window_height(h.get());
+                }
+                self.app.core_mut().applet.configure = Some(configure);
+            }
         }
 
         iced::Command::none()

src/applet/mod.rs

@@ -12,8 +12,10 @@ use crate::{
     },
     iced_style, iced_widget,
     theme::{self, system_dark, system_light, Button, THEME},
-    widget, Application, Element, Renderer,
+    widget::{self, layer_container},
+    Application, Element, Renderer,
 };
+use cctk::sctk::shell::xdg::window::WindowConfigure;
 pub use cosmic_panel_config;
 use cosmic_panel_config::{CosmicPanelBackground, PanelAnchor, PanelSize};
 use cosmic_theme::Theme;
@@ -24,7 +26,7 @@ use iced_widget::runtime::command::platform_specific::wayland::popup::{
     SctkPopupSettings, SctkPositioner,
 };
 use sctk::reexports::protocols::xdg::shell::client::xdg_positioner::{Anchor, Gravity};
-use std::{borrow::Cow, rc::Rc};
+use std::{borrow::Cow, num::NonZeroU32, rc::Rc};
 
 use crate::app::cosmic;
 
@@ -35,15 +37,17 @@ pub struct Context {
     pub background: CosmicPanelBackground,
     pub output_name: String,
     pub panel_type: PanelType,
+    /// Includes the suggested size of the window.
+    /// This can be used by apples to handle overflow themselves.
+    pub configure: Option<WindowConfigure>,
 }
 
-#[derive(Clone, Debug)]
+#[derive(Clone, Debug, PartialEq, Eq)]
 pub enum Size {
-    PanelSize(PanelSize),
     // (width, height)
     Hardcoded((u16, u16)),
+    PanelSize(PanelSize),
 }
-
 #[derive(Clone, Debug, PartialEq)]
 pub enum PanelType {
     Panel,
@@ -90,6 +94,7 @@ impl Default for Context {
                 .unwrap_or(CosmicPanelBackground::ThemeDefault),
             output_name: std::env::var("COSMIC_PANEL_OUTPUT").unwrap_or_default(),
             panel_type: PanelType::from(std::env::var("COSMIC_PANEL_NAME").unwrap_or_default()),
+            configure: None,
         }
     }
 }
@@ -106,6 +111,27 @@ impl Context {
         }
     }
 
+    #[must_use]
+    pub fn suggested_window_size(&self) -> (NonZeroU32, NonZeroU32) {
+        let suggested = self.suggested_size(true);
+        let applet_padding = self.suggested_padding(true);
+        let configured_width = self
+            .configure
+            .as_ref()
+            .and_then(|c| c.new_size.0.map(|w| w))
+            .unwrap_or_else(|| {
+                NonZeroU32::new(suggested.0 as u32 + applet_padding as u32 * 2).unwrap()
+            });
+        let configured_height = self
+            .configure
+            .as_ref()
+            .and_then(|c| c.new_size.1.map(|h| h))
+            .unwrap_or_else(|| {
+                NonZeroU32::new(suggested.1 as u32 + applet_padding as u32 * 2).unwrap()
+            });
+        (configured_width, configured_height)
+    }
+
     #[must_use]
     pub fn suggested_padding(&self, is_symbolic: bool) -> u16 {
         match &self.size {
@@ -134,9 +160,7 @@ impl Context {
             .size_limits(
                 Limits::NONE
                     .min_height(height as f32 + applet_padding as f32 * 2.0)
-                    .max_height(height as f32 + applet_padding as f32 * 2.0)
+                    .min_width(width as f32 + applet_padding as f32 * 2.0),
-                    .min_width(width as f32 + applet_padding as f32 * 2.0)
-                    .max_width(width as f32 + applet_padding as f32 * 2.0),
             )
             .resizable(None)
             .default_text_size(14.0)
@@ -148,27 +172,51 @@ impl Context {
         settings
     }
 
+    #[must_use]
+    pub fn is_horizontal(&self) -> bool {
+        matches!(self.anchor, PanelAnchor::Top | PanelAnchor::Bottom)
+    }
+
     #[must_use]
     pub fn icon_button_from_handle<'a, Message: 'static>(
         &self,
         icon: widget::icon::Handle,
     ) -> crate::widget::Button<'a, Message> {
+        let suggested = self.suggested_size(icon.symbolic);
+        let applet_padding = self.suggested_padding(icon.symbolic);
+        let (mut configured_width, mut configured_height) = self.suggested_window_size();
+
+        // Adjust the width to include padding and force the crosswise dim to match the window size
+        let is_horizontal = self.is_horizontal();
+        if is_horizontal {
+            configured_width =
+                NonZeroU32::new(suggested.0 as u32 + applet_padding as u32 * 2).unwrap();
+        } else {
+            configured_height =
+                NonZeroU32::new(suggested.1 as u32 + applet_padding as u32 * 2).unwrap();
+        }
         let symbolic = icon.symbolic;
-        let suggested = self.suggested_size(symbolic);
+
-        let applet_padding = self.suggested_padding(symbolic);
         crate::widget::button(
-            widget::icon(icon)
+            layer_container(
-                .style(if symbolic {
+                widget::icon(icon)
-                    theme::Svg::Custom(Rc::new(|theme| crate::iced_style::svg::Appearance {
+                    .style(if symbolic {
-                        color: Some(theme.cosmic().background.on.into()),
+                        theme::Svg::Custom(Rc::new(|theme| crate::iced_style::svg::Appearance {
-                    }))
+                            color: Some(theme.cosmic().background.on.into()),
-                } else {
+                        }))
-                    theme::Svg::default()
+                    } else {
-                })
+                        theme::Svg::default()
-                .width(Length::Fixed(suggested.0 as f32))
+                    })
-                .height(Length::Fixed(suggested.1 as f32)),
+                    .width(Length::Fixed(suggested.0 as f32))
+                    .height(Length::Fixed(suggested.1 as f32)),
+            )
+            .align_x(Horizontal::Center)
+            .align_y(Vertical::Center)
+            .width(Length::Fill)
+            .height(Length::Fill),
         )
-        .padding(applet_padding)
+        .width(Length::Fixed(configured_width.get() as f32))
+        .height(Length::Fixed(configured_height.get() as f32))
         .style(Button::AppletIcon)
     }