feat: enable use of markup in clock module format and format_popup, a…

…nd update documentation to reflect supporting Pango markup in both
JakeStanger · Feb 9, 2024 · f4384b6 · f4384b6
1 parent d981265
commit f4384b6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/docs/modules/Clock.md b/docs/modules/Clock.md
@@ -10,8 +10,8 @@ Clicking on the widget opens a popup with the time and a calendar.
 
 | Name           | Type     | Default                            | Description                                                                         |
 |----------------|----------|------------------------------------|-------------------------------------------------------------------------------------|
-| `format`       | `string` | `%d/%m/%Y %H:%M`                   | Date/time format string.                                                            |
-| `format_popup` | `string` | `%H:%M:%S`                         | Date/time format string to display in the popup header.                             |
+| `format`       | `string` | `%d/%m/%Y %H:%M`                   | Date/time format string. Pango markup is supported.                                 |
+| `format_popup` | `string` | `%H:%M:%S`                         | Date/time format string to display in the popup header. Pango markup is supported.  |
 | `locale`       | `string` | `$LC_TIME` or `$LANG` or `'POSIX'` | Locale to use (eg `en_GB`). Defaults to the system language (reading from env var). |
 
 > Detail on available tokens can be found here: <https://docs.rs/chrono/latest/chrono/format/strftime/index.html>
@@ -80,4 +80,4 @@ end:
 | `.popup-clock .calendar-clock` | Clock inside the popup                                                             |
 | `.popup-clock .calendar`       | Calendar widget inside the popup. GTK provides some OOTB styling options for this. |
 
-For more information on styling, please see the [styling guide](styling-guide).
+For more information on styling, please see the [styling guide](styling-guide).
diff --git a/src/modules/clock.rs b/src/modules/clock.rs
@@ -99,8 +99,10 @@ impl Module<Button> for ClockModule {
         info: &ModuleInfo,
     ) -> Result<ModuleParts<Button>> {
         let button = Button::new();
-        let label = Label::new(None);
-        label.set_angle(info.bar_position.get_angle());
+        let label = Label::builder()
+            .angle(info.bar_position.get_angle())
+            .use_markup(true)
+            .build();
         button.add(&label);
 
         let tx = context.tx.clone();
@@ -132,7 +134,10 @@ impl Module<Button> for ClockModule {
     ) -> Option<gtk::Box> {
         let container = gtk::Box::new(Orientation::Vertical, 0);
 
-        let clock = Label::builder().halign(Align::Center).build();
+        let clock = Label::builder()
+            .halign(Align::Center)
+            .use_markup(true)
+            .build();
         clock.add_class("calendar-clock");
 
         container.add(&clock);