feat: panel / dock blur support

Author: wash2

Cargo.lock

@@ -22,16 +22,17 @@ sctk = { package = "smithay-client-toolkit", version = "0.20.0", features = [
 ] }
 
 [patch."https://github.com/pop-os/cosmic-protocols"]
-cctk = { package = "cosmic-client-toolkit", git = "https://github.com/pop-os//cosmic-protocols" }
+cctk = { package = "cosmic-client-toolkit", git = "https://github.com/pop-os//cosmic-protocols", rev = "a7d2d7a" }
+cosmic-protocols = { git = "https://github.com/pop-os//cosmic-protocols", rev = "a7d2d7a" }
 
 # [patch."https://github.com/pop-os/xdg-shell-wrapper"]
 # xdg-shell-wrapper-config = { path = "../xdg-shell-wrapper/xdg-shell-wrapper-config" }
 # xdg-shell-wrapper = { path = "../xdg-shell-wrapper" }
 # xdg-shell-wrapper = { git = "https://github.com/pop-os/xdg-shell-wrapper//", branch = "update" }
 # xdg-shell-wrapper-config = { git = "https://github.com/pop-os/xdg-shell-wrapper//", branch = "update" }
 
-# [patch."https://github.com/pop-os/libcosmic"]
-# cosmic-config = { git = "https://github.com/pop-os/libcosmic//" }
-# libcosmic = { git = "https://github.com/pop-os/libcosmic//" }
-# cosmic-theme = { git = "https://github.com/pop-os/libcosmic//" }
-# iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic//" }
+[patch."https://github.com/pop-os/libcosmic"]
+cosmic-config = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
+libcosmic = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
+cosmic-theme = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }
+iced_tiny_skia = { git = "https://github.com/pop-os/libcosmic//", branch = "theme-v2" }

Cargo.toml

@@ -25,6 +25,10 @@ wayland-protocols = { version = "0.32.11", features = ["staging"] }
 
 xdg-shell-wrapper-config = { path = "../xdg-shell-wrapper-config" }
 cctk = { package = "cosmic-client-toolkit", git = "https://github.com/pop-os/cosmic-protocols" }
+cosmic-protocols = { git = "https://github.com/pop-os/cosmic-protocols", default-features = false, features = [
+    "client",
+    "server",
+], rev = "a7d2d7a" }
 # cctk = { package = "cosmic-client-toolkit", path = "../../cosmic-protocols/client-toolkit" }
 wayland-egl = "0.32.10"
 wayland-protocols-wlr = { version = "0.3.11", features = ["client"] }

cosmic-panel-bin/Cargo.toml

@@ -37,13 +37,13 @@ pub fn watch_cosmic_theme(
     handle.insert_source(entries_rx, move |event, _, state| {
         match event {
             channel::Event::Msg(ThemeUpdate::Dark(theme)) => {
-                state.space.set_dark(theme);
+                state.space.set_dark(theme, state.client_state.blur_enabled);
             },
             channel::Event::Msg(ThemeUpdate::Mode(is_dark)) => {
-                state.space.set_theme_mode(is_dark);
+                state.space.set_theme_mode(is_dark, state.client_state.blur_enabled);
             },
             channel::Event::Msg(ThemeUpdate::Light(theme)) => {
-                state.space.set_light(theme);
+                state.space.set_light(theme, state.client_state.blur_enabled);
             },
             channel::Event::Closed => {},
         };

cosmic-panel-bin/src/config_watching.rs

@@ -1,8 +1,8 @@
 // Element for rendering a panel background
 
 use calloop::LoopHandle;
+use cosmic::iced::core::Shadow;
 use cosmic::iced::{Color, Length, id};
-use cosmic::iced_core::Shadow;
 use cosmic::widget::space;
 use cosmic::{Theme, theme};
 
@@ -68,16 +68,16 @@ impl Program for Background {
                     let cosmic = theme.cosmic();
 
                     cosmic::widget::container::Style {
-                        text_color: Some(cosmic.background.on.into()),
+                        text_color: Some(cosmic.background(theme.transparent).on.into()),
                         background: Some(Color::from(color).into()),
                         border: cosmic::iced::Border {
                             radius: radius_arr.into(),
                             width: 0.,
-                            color: cosmic.background.divider.into(),
+                            color: cosmic.background(theme.transparent).divider.into(),
                         },
                         shadow: Shadow::default(),
                         snap: true,
-                        icon_color: Some(cosmic.background.on.into()),
+                        icon_color: Some(cosmic.background(theme.transparent).on.into()),
                     }
                 })),
         )

cosmic-panel-bin/src/iced/elements/background.rs

@@ -9,8 +9,8 @@ use calloop::LoopHandle;
 use crate::xdg_shell_wrapper::shared_state::GlobalState;
 use crate::xdg_shell_wrapper::{self};
 use cosmic::Element;
+use cosmic::iced::core::id;
 use cosmic::iced::{Length, Padding};
-use cosmic::iced_core::id;
 use cosmic::theme::{self, Button};
 use cosmic::widget::{Id, button, layer_container};
 use smithay::utils::{Logical, Point, Size};
@@ -167,10 +167,8 @@ impl Program for OverflowButton {
             button::custom(
                 layer_container(
                     cosmic::widget::icon(cosmic::widget::icon::from_name(self.icon.clone()).into())
-                        .class(theme::Svg::Custom(Rc::new(|theme| {
-                            cosmic::iced_widget::svg::Style {
-                                color: Some(theme.cosmic().background.on.into()),
-                            }
+                        .class(theme::Svg::Custom(Rc::new(|theme| cosmic::widget::svg::Style {
+                            color: Some(theme.cosmic().background(theme.transparent).on.into()),
                         })))
                         .width(Length::Fixed(self.icon_size as f32))
                         .height(Length::Fixed(self.icon_size as f32)),

cosmic-panel-bin/src/iced/elements/overflow_button.rs

@@ -1,8 +1,8 @@
 // popup for rendering overflow items in their own space
 
 use calloop::LoopHandle;
+use cosmic::iced::core::Shadow;
 use cosmic::iced::{Color, Length, id};
-use cosmic::iced_core::Shadow;
 use cosmic::widget::{container, space};
 use cosmic::{Theme, theme};
 
@@ -55,15 +55,17 @@ impl Program for OverflowPopup {
                     let radius_m = cosmic.corner_radii.radius_m;
 
                     container::Style {
-                        text_color: Some(cosmic.background.on.into()),
-                        background: Some(Color::from(cosmic.background.base).into()),
+                        text_color: Some(cosmic.background(theme.transparent).on.into()),
+                        background: Some(
+                            Color::from(cosmic.background(theme.transparent).base).into(),
+                        ),
                         border: cosmic::iced::Border {
                             radius: radius_m.into(),
                             width: border_width,
-                            color: cosmic.background.divider.into(),
+                            color: cosmic.background(theme.transparent).divider.into(),
                         },
                         shadow: Shadow::default(),
-                        icon_color: Some(cosmic.background.on.into()),
+                        icon_color: Some(cosmic.background(theme.transparent).on.into()),
                         snap: true,
                     }
                 })),

cosmic-panel-bin/src/iced/elements/overflow_popup.rs

@@ -12,20 +12,20 @@ use std::time::{Duration, Instant};
 use crate::iced::state::State;
 use crate::xdg_shell_wrapper::shared_state::GlobalState;
 use cosmic::Theme;
+use cosmic::iced::Renderer as IcedRenderer;
 use cosmic::iced::advanced::widget::Tree;
+use cosmic::iced::core::clipboard::Null as NullClipboard;
+use cosmic::iced::core::renderer::Style;
+use cosmic::iced::core::{Color, Font, Length, Pixels};
 use cosmic::iced::event::Event;
 use cosmic::iced::futures::{self, FutureExt, StreamExt};
 use cosmic::iced::keyboard::{Event as KeyboardEvent, Modifiers as IcedModifiers};
 use cosmic::iced::mouse::{Button as MouseButton, Cursor, Event as MouseEvent, ScrollDelta};
+use cosmic::iced::runtime::Action;
+use cosmic::iced::runtime::task::into_stream;
 use cosmic::iced::touch::{Event as TouchEvent, Finger};
 use cosmic::iced::window::Event as WindowEvent;
 use cosmic::iced::{self, Limits, Point as IcedPoint, Size as IcedSize, Task};
-use cosmic::iced_core::clipboard::Null as NullClipboard;
-use cosmic::iced_core::renderer::Style;
-use cosmic::iced_core::{Color, Font, Length, Pixels};
-use cosmic::iced_renderer::Renderer as IcedRenderer;
-use cosmic::iced_runtime::Action;
-use cosmic::iced_runtime::task::into_stream;
 use cosmic::widget::Id;
 use iced_tiny_skia::graphics::Viewport;
 use ordered_float::OrderedFloat;
@@ -169,7 +169,10 @@ impl iced::Executor for MyExecutor {
         Ok(MyExecutor { scheduler, executor_token: Some(executor_token) })
     }
 
-    fn spawn(&self, future: impl Future<Output = ()> + cosmic::iced_futures::MaybeSend + 'static) {
+    fn spawn(
+        &self,
+        future: impl Future<Output = ()> + iced::runtime::futures::MaybeSend + 'static,
+    ) {
         self.scheduler.schedule(future).unwrap();
     }
 
@@ -288,10 +291,11 @@ impl<P: Program + Send + 'static> IcedElement<P> {
         program: P,
         size: impl Into<Size<i32, Logical>>,
         handle: LoopHandle<'static, GlobalState>,
-        theme: cosmic::Theme,
+        mut theme: cosmic::Theme,
         panel_id: usize,
         request_redraws: bool,
     ) -> IcedElement<P> {
+        theme.transparent = theme.cosmic().frosted_applets;
         let size = size.into();
         let mut renderer = IcedRenderer::new(Font::default(), Pixels(16.0));
 
@@ -383,7 +387,8 @@ impl<P: Program + Send + 'static> IcedElement<P> {
         self.0.lock().unwrap().update(true);
     }
 
-    pub fn set_theme(&self, theme: cosmic::Theme) {
+    pub fn set_theme(&self, mut theme: cosmic::Theme) {
+        theme.transparent = theme.cosmic().frosted_applets;
         let mut guard = self.0.lock().unwrap();
         guard.theme = theme.clone();
     }

cosmic-panel-bin/src/iced/mod.rs

@@ -2,9 +2,8 @@ use super::IcedProgram as Program;
 use cosmic::iced::core::event::{self, Event};
 use cosmic::iced::core::widget::operation::{self, Operation};
 use cosmic::iced::core::{Clipboard, Size, mouse, renderer};
-use cosmic::iced_core;
-use cosmic::iced_runtime::Task;
-use cosmic::iced_runtime::user_interface::{self, UserInterface};
+use cosmic::iced::runtime::Task;
+use cosmic::iced::runtime::user_interface::{self, UserInterface};
 
 /// The execution state of a [`Program`]. It leverages caching, event
 /// processing, and rendering primitive storage.
@@ -27,7 +26,7 @@ where
     /// Creates a new [`State`] with the provided [`Program`], initializing its
     /// primitive with the given logical bounds and renderer.
     pub fn new(
-        id: iced_core::id::Id,
+        id: cosmic::iced::core::id::Id,
         mut program: P,
         bounds: Size,
         renderer: &mut cosmic::Renderer,
@@ -88,7 +87,7 @@ where
     /// after updating it, only if an update was necessary.
     pub fn update(
         &mut self,
-        id: iced_core::id::Id,
+        id: cosmic::iced::core::id::Id,
         bounds: Size,
         cursor: mouse::Cursor,
         renderer: &mut cosmic::Renderer,
@@ -121,7 +120,7 @@ where
         messages.append(&mut self.queued_messages);
 
         let task = if messages.is_empty() {
-            if let cosmic::iced_runtime::user_interface::State::Updated {
+            if let cosmic::iced::runtime::user_interface::State::Updated {
                 mouse_interaction, ..
             } = state
             {
@@ -144,7 +143,7 @@ where
             let mut user_interface =
                 build_user_interface(id, &mut self.program, temp_cache, renderer, bounds);
 
-            if let cosmic::iced_runtime::user_interface::State::Updated {
+            if let cosmic::iced::runtime::user_interface::State::Updated {
                 mouse_interaction, ..
             } = state
             {
@@ -164,7 +163,7 @@ where
     /// Applies [`Operation`]s to the [`State`]
     pub fn operate(
         &mut self,
-        id: iced_core::id::Id,
+        id: cosmic::iced::core::id::Id,
         renderer: &mut cosmic::Renderer,
         operations: impl Iterator<Item = Box<dyn Operation>>,
         bounds: Size,
@@ -198,7 +197,7 @@ where
 }
 
 fn build_user_interface<'a, P: Program>(
-    _id: iced_core::id::Id,
+    _id: cosmic::iced::core::id::Id,
     program: &'a mut P,
     cache: user_interface::Cache,
     renderer: &mut cosmic::Renderer,

cosmic-panel-bin/src/iced/state.rs

@@ -313,6 +313,7 @@ fn main() -> Result<()> {
     let mut server_state = ServerState::new(s_dh.clone());
 
     let mut client_state = ClientState::new(event_loop.handle(), &mut space, &mut server_state)?;
+    space.corner_radius_manager = client_state.cosmic_corner_radius_manager.clone();
     client_state.init_workspace_state();
     client_state.init_toplevel_info_state();
     client_state.init_toplevel_manager_state();