fix(menu): styling

Also improves the styling of resize indicators, and removes the unnecessary `.density()` method call for the SSD header.
pop-os · Oct 8, 2024 · 7cad070 · 7cad070
1 parent 07bd8be
commit 7cad070
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 81 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/shell/element/resize_indicator.rs b/src/shell/element/resize_indicator.rs
@@ -86,10 +86,10 @@ impl Program for ResizeIndicatorInternal {
                 } else {
                     "go-down-symbolic"
                 })
-                .size(32)
+                .size(20)
                 .prefer_svg(true)
                 .apply(container)
-                .padding(2)
+                .padding(8)
                 .style(icon_container_style())
                 .width(Length::Shrink)
                 .apply(container)
@@ -106,10 +106,10 @@ impl Program for ResizeIndicatorInternal {
                     } else {
                         "go-next-symbolic"
                     })
-                    .size(32)
+                    .size(20)
                     .prefer_svg(true)
                     .apply(container)
-                    .padding(4)
+                    .padding(8)
                     .style(icon_container_style())
                     .width(Length::Shrink)
                     .apply(container)
@@ -120,23 +120,11 @@ impl Program for ResizeIndicatorInternal {
                     horizontal_space(36).into()
                 },
                 row(vec![
-                    text(&self.shortcut1)
-                        .font(cosmic::font::FONT_SEMIBOLD)
-                        .size(14)
-                        .into(),
-                    text(fl!("grow-window"))
-                        .font(cosmic::font::FONT)
-                        .size(14)
-                        .into(),
+                    text::heading(&self.shortcut1).into(),
+                    text::body(fl!("grow-window")).into(),
                     horizontal_space(40).into(),
-                    text(&self.shortcut2)
-                        .font(cosmic::font::FONT_SEMIBOLD)
-                        .size(14)
-                        .into(),
-                    text(fl!("shrink-window"))
-                        .font(cosmic::font::FONT)
-                        .size(14)
-                        .into(),
+                    text::heading(&self.shortcut2).into(),
+                    text::body(fl!("shrink-window")).into(),
                 ])
                 .apply(container)
                 .center_x()
@@ -158,10 +146,10 @@ impl Program for ResizeIndicatorInternal {
                     } else {
                         "go-previous-symbolic"
                     })
-                    .size(32)
+                    .size(20)
                     .prefer_svg(true)
                     .apply(container)
-                    .padding(4)
+                    .padding(8)
                     .style(icon_container_style())
                     .height(Length::Shrink)
                     .apply(container)
@@ -181,10 +169,10 @@ impl Program for ResizeIndicatorInternal {
                 } else {
                     "go-up-symbolic"
                 })
-                .size(32)
+                .size(20)
                 .prefer_svg(true)
                 .apply(container)
-                .padding(4)
+                .padding(8)
                 .style(icon_container_style())
                 .width(Length::Shrink)
                 .apply(container)

diff --git a/src/shell/element/stack/tab.rs b/src/shell/element/stack/tab.rs
@@ -158,7 +158,7 @@ impl<Message: TabMessage + 'static> Tab<Message> {
             id,
             app_icon: from_name(app_id.into()).size(16).icon(),
             title: title.into(),
-            font: cosmic::font::FONT,
+            font: cosmic::font::default(),
             close_message: None,
             press_message: None,
             right_click_message: None,

diff --git a/src/shell/element/stack/tab_text.rs b/src/shell/element/stack/tab_text.rs
@@ -39,7 +39,7 @@ impl TabText {
         TabText {
             width: Length::Shrink,
             height: Length::Shrink,
-            font: cosmic::font::DEFAULT,
+            font: cosmic::font::default(),
             font_size: 14.0,
             selected,
             text,

diff --git a/src/shell/element/stack/tabs.rs b/src/shell/element/stack/tabs.rs
@@ -134,7 +134,7 @@ where
                     } else {
                         TabBackgroundTheme::ActiveDeactivated
                     })
-                    .font(cosmic::font::FONT_SEMIBOLD)
+                    .font(cosmic::font::semibold())
                     .active()
             } else if i.checked_sub(1) == Some(active) {
                 tab.rule_style(rule).non_active()

diff --git a/src/shell/element/stack_hover.rs b/src/shell/element/stack_hover.rs
@@ -39,10 +39,7 @@ impl Program for StackHoverInternal {
                 .icon()
                 .into(),
             horizontal_space(16).into(),
-            text(fl!("stack-windows"))
-                .font(cosmic::font::FONT)
-                .size(24)
-                .into(),
+            text::title3(fl!("stack-windows")).into(),
         ])
         .align_items(Alignment::Center)
         .apply(container)

diff --git a/src/shell/element/swap_indicator.rs b/src/shell/element/swap_indicator.rs
@@ -35,10 +35,7 @@ impl Program for SwapIndicatorInternal {
                 .icon()
                 .into(),
             horizontal_space(16).into(),
-            text(fl!("swap-windows"))
-                .font(cosmic::font::FONT)
-                .size(24)
-                .into(),
+            text::title3(fl!("swap-windows")).into(),
         ])
         .align_items(Alignment::Center)
         .apply(container)

diff --git a/src/shell/element/window.rs b/src/shell/element/window.rs
@@ -11,10 +11,7 @@ use crate::{
     },
 };
 use calloop::LoopHandle;
-use cosmic::{
-    config::Density,
-    iced::{Color, Command},
-};
+use cosmic::iced::{Color, Command};
 use smithay::{
     backend::{
         input::KeyState,
@@ -503,7 +500,6 @@ impl Program for CosmicWindowInternal {
             .on_drag(Message::DragStart)
             .on_close(Message::Close)
             .focused(self.window.is_activated(false))
-            .density(Density::Compact)
             .on_double_click(Message::Maximize)
             .on_right_click(Message::Menu);