WIP Show auto-hide panels in workspaces overlay

Cargo.toml

@@ -39,6 +39,8 @@ zbus = "5.9.0"
 tokio-stream = { version = "0.1.17", features = ["sync"] }
 ash = { version = "0.38.0", features = ["loaded"] }
 bytemuck = "1.23.2"
+# cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel" }
+cosmic-panel-config = { git = "https://github.com/pop-os/cosmic-panel", branch = "workspaces-panel", features = ["wayland-rs"] }
 
 [dependencies.i18n-embed]
 version = "0.16"

src/main.rs

@@ -31,6 +31,9 @@ use cosmic::{
 };
 use cosmic_comp_config::CosmicCompConfig;
 use cosmic_config::{CosmicConfigEntry, cosmic_config_derive::CosmicConfigEntry};
+use cosmic_panel_config::{
+    CosmicPanelConfig, CosmicPanelContainerConfig, CosmicPanelContainerConfigEntry,
+};
 use i18n_embed::DesktopLanguageRequester;
 use std::{
     collections::{HashMap, HashSet},
@@ -196,6 +199,7 @@ struct App {
     drop_target: Option<DropTarget>,
     scroll: Option<(f32, Instant)>,
     dbus_interface: Option<dbus::Interface>,
+    panel_config: CosmicPanelContainerConfig,
 }
 
 #[derive(Debug, Default)]
@@ -271,6 +275,8 @@ impl App {
 
     fn show(&mut self) -> Task<cosmic::Action<Msg>> {
         if !self.visible {
+            //dbg!(&self.panel_regions());
+
             self.visible = true;
             let outputs = self.outputs.clone();
             let cmd = Task::batch(
@@ -348,6 +354,80 @@ impl App {
         self.capture_filter = capture_filter.clone();
         self.send_wayland_cmd(backend::Cmd::CaptureFilter(capture_filter));
     }
+
+    // TODO: iinput region when it doesn't extend to edge?
+    fn panel_regions(&self, output_handle: &wl_output::WlOutput) -> PanelRegions {
+        let Some(output) = self.outputs.iter().find(|o| o.handle == *output_handle) else {
+            return PanelRegions::default();
+        };
+
+        use cosmic_panel_config::PanelAnchor;
+        let mut regions = PanelRegions::default();
+        // TODO: also use overlap notify if present?
+        for config in &self.panel_config.config_list {
+            /*
+            &config.exclusive_zone;
+            &config.autohide;
+            &config.size;
+            &config.anchor;
+            */
+            if config.autohide.is_some() && !config.exclusive_zone {
+                /*
+                let output_dims = self
+                    .output
+                    .as_ref()
+                    .and_then(|(_, _, info)| {
+                        info.modes.iter().find_map(|m| if m.current { Some(m.dimensions) } else { None })
+                    })
+                .map(|(w, h)| (w as u32, h as u32));
+                */
+
+                // XXX right way to get size in px of pane?
+                let dimention_constraints = config.get_dimensions(
+                    Some((output.width as u32, output.height as u32)),
+                    None,
+                    Some(config.get_effective_anchor_gap()),
+                );
+                let size =
+                    config.size.get_applet_icon_size_with_padding(true) + u32::from(config.margin);
+                match config.anchor {
+                    PanelAnchor::Left => {
+                        let size = dimention_constraints.0.map_or(size, |constraints| {
+                            size.clamp(constraints.start, constraints.end)
+                        });
+                        regions.left += size;
+                    }
+                    PanelAnchor::Right => {
+                        let size = dimention_constraints.0.map_or(size, |constraints| {
+                            size.clamp(constraints.start, constraints.end)
+                        });
+                        regions.right += size;
+                    }
+                    PanelAnchor::Top => {
+                        let size = dimention_constraints.1.map_or(size, |constraints| {
+                            size.clamp(constraints.start, constraints.end)
+                        });
+                        regions.top += size;
+                    }
+                    PanelAnchor::Bottom => {
+                        let size = dimention_constraints.1.map_or(size, |constraints| {
+                            size.clamp(constraints.start, constraints.end)
+                        });
+                        regions.bottom += size;
+                    }
+                }
+            }
+        }
+        regions
+    }
+}
+
+#[derive(Debug, Default)]
+struct PanelRegions {
+    top: u32,
+    bottom: u32,
+    left: u32,
+    right: u32,
 }
 
 impl Application for App {
@@ -360,6 +440,7 @@ impl Application for App {
         (
             Self {
                 core,
+                panel_config: CosmicPanelContainerConfig::load().unwrap(), // TODO watch for changes
                 ..Default::default()
             },
             Task::none(),
@@ -870,3 +951,24 @@ pub fn main() -> iced::Result {
         Args::parse(),
     )
 }
+
+fn f() -> Subscription<Msg> {
+    let mut subscriptions = vec![
+        cosmic_config::config_subscription::<_, CosmicPanelContainerConfigEntry>(
+            "panel-config-subscription",
+            "com.system76.CosmicPanel".into(),
+            1,
+        )
+        .map(|update| {
+            // update.errors;
+            dbg!(update.config);
+            todo!()
+        }),
+    ];
+    cosmic_config::config_subscription::<_, CosmicPanelConfig>(
+        "panel-config-subscription-Panel",
+        "com.system76.CosmicPanel.Panel".into(),
+        1,
+    );
+    iced::Subscription::batch(subscriptions)
+}

src/view/mod.rs

@@ -150,6 +150,15 @@ pub(crate) fn layer_surface<'a>(
                 .width(Length::Fill),
         ),
     };
+
+    let panel_regions = app.panel_regions(&surface.output);
+    let container = widget::container(container).padding(iced::Padding {
+        bottom: panel_regions.bottom as f32,
+        top: panel_regions.top as f32,
+        left: panel_regions.left as f32,
+        right: panel_regions.right as f32,
+    });
+
     let output = surface.output.clone();
     widget::mouse_area(container)
         .on_scroll(move |delta| Msg::OnScroll(output.clone(), delta))