fix: font mono for time applet + update libcosmic

pop-os · Oct 15, 2024 · 71d69a9 · 71d69a9
1 parent 3670f12
commit 71d69a9
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 31 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cosmic-applet-time/src/window.rs b/cosmic-applet-time/src/window.rs
@@ -9,6 +9,7 @@ use cosmic::{
     applet::{cosmic_panel_config::PanelAnchor, menu_button, padded_control},
     cctk::sctk::reexports::calloop,
     cosmic_theme::Spacing,
+    font,
     iced::{
         futures::{channel::mpsc, SinkExt, StreamExt, TryFutureExt},
         subscription,
@@ -463,7 +464,10 @@ impl cosmic::Application for Window {
 
             Element::from(
                 row!(
-                    self.core.applet.text(self.format(bag, &self.now)),
+                    self.core
+                        .applet
+                        .text(self.format(bag, &self.now))
+                        .font(font::mono()),
                     container(vertical_space(Length::Fixed(
                         (self.core.applet.suggested_size(true).1
                             + 2 * self.core.applet.suggested_padding(true))
@@ -486,7 +490,13 @@ impl cosmic::Application for Window {
                 let formated = self.format(date_bag, &self.now);
 
                 for p in formated.split_whitespace() {
-                    elements.push(self.core.applet.text(p.to_owned()).into());
+                    elements.push(
+                        self.core
+                            .applet
+                            .text(p.to_owned())
+                            .font(font::mono())
+                            .into(),
+                    );
                 }
 
                 elements.push(
@@ -514,7 +524,13 @@ impl cosmic::Application for Window {
             // todo: split using formatToParts when it is implemented
             // https://github.com/unicode-org/icu4x/issues/4936#issuecomment-2128812667
             for p in formated.split_whitespace().flat_map(|s| s.split(':')) {
-                elements.push(self.core.applet.text(p.to_owned()).into());
+                elements.push(
+                    self.core
+                        .applet
+                        .text(p.to_owned())
+                        .font(font::mono())
+                        .into(),
+                );
             }
 
             let date_time_col = Column::with_children(elements)

diff --git a/cosmic-applet-workspaces/src/components/app.rs b/cosmic-applet-workspaces/src/components/app.rs
@@ -3,20 +3,14 @@
 
 use cctk::sctk::reexports::{calloop::channel::SyncSender, client::backend::ObjectId};
 use cosmic::{
-    applet::cosmic_panel_config::PanelAnchor,
-    font::FONT_BOLD,
-    iced::{
+    applet::cosmic_panel_config::PanelAnchor, font, iced::{
         alignment::{Horizontal, Vertical},
         event,
         mouse::{self, ScrollDelta},
         widget::{button, column, row},
         Event::Mouse,
         Length, Subscription,
-    },
-    iced_core::{Background, Border},
-    iced_style::application,
-    widget::{container, horizontal_space, vertical_space},
-    Command, Element, Theme,
+    }, iced_core::{Background, Border}, iced_style::application, widget::{container, horizontal_space, vertical_space}, Command, Element, Theme
 };
 
 use cosmic_protocols::workspace::v1::client::zcosmic_workspace_handle_v1;
@@ -176,7 +170,11 @@ impl cosmic::Application for IcedWorkspacesApplet {
         let popup_index = self.popup_index().unwrap_or(self.workspaces.len());
 
         let buttons = self.workspaces[..popup_index].iter().filter_map(|w| {
-            let content = self.core.applet.text(w.0.clone()).font(FONT_BOLD);
+            let content = self
+                .core
+                .applet
+                .text(w.0.clone())
+                .font(font::bold());
 
             let (width, height) = if self.core.applet.is_horizontal() {
                 (suggested_total as f32, suggested_window_size.1.get() as f32)