design: make PANEL_SIZE a constant

Signed-off-by: Ryan Brue <ryanbrue.dev@gmail.com>
ryanabx · Sep 22, 2024 · 8203eb4 · 8203eb4
1 parent 8b3b483
commit 8203eb4
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 22 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/app_tray/mod.rs b/src/app_tray/mod.rs
@@ -11,7 +11,11 @@ use iced::{
     Element, Length, Task, Theme,
 };
 
-use crate::{component_theme::button_style, config::AppTrayConfig, desktop_entry::EntryInfo};
+use crate::{
+    component_theme::{button_style, PANEL_SIZE},
+    config::AppTrayConfig,
+    desktop_entry::EntryInfo,
+};
 
 pub mod compositor;
 
@@ -82,8 +86,8 @@ impl<'a> AppTray<'a> {
                 Element::from(
                     iced::widget::container(x)
                         // .width(Length::Fill)
-                        .width(48)
-                        .height(48)
+                        .width(PANEL_SIZE as u16)
+                        .height(PANEL_SIZE as u16)
                         .padding(4.0),
                 )
             });

diff --git a/src/component_theme.rs b/src/component_theme.rs
@@ -4,6 +4,8 @@ use iced::{
     Background, Border, Theme,
 };
 
+pub const PANEL_SIZE: u32 = 48;
+
 pub fn button_style(
     theme: &Theme,
     status: button::Status,

diff --git a/src/panel.rs b/src/panel.rs
@@ -3,7 +3,7 @@ use std::rc::Rc;
 use iced::{
     border::Radius,
     platform_specific::{
-        runtime::wayland::layer_surface::{IcedOutput, SctkLayerSurfaceSettings},
+        runtime::wayland::layer_surface::{IcedMargin, IcedOutput, SctkLayerSurfaceSettings},
         shell::commands::layer_surface::get_layer_surface,
     },
     widget::{column, row, text},
@@ -15,6 +15,7 @@ use wayland_protocols_wlr::layer_shell;
 
 use crate::{
     app_tray::{AppTray, AppTrayMessage},
+    component_theme::PANEL_SIZE,
     config::PanelConfig,
     desktop_entry::DesktopEntryCache,
     settings_tray::{SettingsTray, SettingsTrayMessage},
@@ -43,12 +44,18 @@ impl<'a> Panel<'a> {
             layer: smithay_client_toolkit::shell::wlr_layer::Layer::Top,
             // keyboard_interactivity: todo!(),
             pointer_interactivity: true,
-            anchor: Anchor::LEFT.union(Anchor::BOTTOM).union(Anchor::RIGHT),
+            anchor: Anchor::BOTTOM.union(Anchor::LEFT).union(Anchor::RIGHT),
             output: IcedOutput::Active,
             // namespace: todo!(),
-            // margin: todo!(),
-            size: Some((None, Some(48))),
-            exclusive_zone: 48,
+            // margin: IcedMargin {
+            //     top: 5,
+            //     right: 5,
+            //     left: 5,
+            //     bottom: 5,
+            // },
+            // size: Some((None, Some(48))),
+            size: Some((None, Some(PANEL_SIZE))),
+            exclusive_zone: PANEL_SIZE as i32,
             // size_limits: todo!(),
             ..Default::default()
         });

diff --git a/src/start_menu/mod.rs b/src/start_menu/mod.rs
@@ -12,7 +12,7 @@ use iced::{
 };
 
 use crate::{
-    component_theme::button_style,
+    component_theme::{button_style, PANEL_SIZE},
     components::app_icon,
     desktop_entry::{DesktopEntryCache, EntryInfo},
 };
@@ -40,8 +40,8 @@ impl<'a> StartMenu<'a> {
                 .style(Self::tray_button_style)
                 .on_press(StartMenuMessage::MenuToggle),
         )
-        .width(48)
-        .height(48)
+        .width(PANEL_SIZE as u16)
+        .height(PANEL_SIZE as u16)
         .padding(4.0)
         .into()
     }