zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-17 23:01:04 +02:00
Code Activity

feat: justify property for clock and custom label

Browse source
This commit is contained in:
BowDown097 2025-01-01 12:07:42 -08:00
parent 5136637752
commit 708118d266
6 changed files with 52 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/clock.rs
View file

@ -8,7 +8,7 @@ use serde::Deserialize;
use tokio::sync::{broadcast, mpsc};
use tokio::time::sleep;
use crate::config::{CommonConfig, ModuleOrientation};
use crate::config::{CommonConfig, ModuleJustification, ModuleOrientation};
use crate::gtk_helpers::IronbarGtkExt;
use crate::modules::{
Module, ModuleInfo, ModuleParts, ModulePopup, ModuleUpdateEvent, PopupButton, WidgetContext,
@ -61,6 +61,14 @@ pub struct ClockModule {
/// See [common options](module-level-options#common-options).
#[serde(flatten)]
pub common: Option<CommonConfig>,
/// The justification (alignment) of the date/time shown on the bar.
///
/// **Valid options**: `left`, `right`, `center`, `fill`
/// <br>
/// **Default**: `left`
#[serde(default)]
justify: ModuleJustification
}
impl Default for ClockModule {
@ -71,6 +79,7 @@ impl Default for ClockModule {
locale: default_locale(),
orientation: ModuleOrientation::Horizontal,
common: Some(CommonConfig::default()),
justify: ModuleJustification::Left
}
}
}
@ -129,6 +138,7 @@ impl Module<Button> for ClockModule {
let label = Label::builder()
.angle(self.orientation.to_angle())
.use_markup(true)
.justify(self.justify.into())
.build();
button.add(&label);

11
src/modules/custom/label.rs
View file

@ -4,7 +4,7 @@ use serde::Deserialize;
use super::{CustomWidget, CustomWidgetContext};
use crate::build;
use crate::config::ModuleOrientation;
use crate::config::{ModuleJustification, ModuleOrientation};
use crate::dynamic_value::dynamic_string;
use crate::gtk_helpers::IronbarLabelExt;
@ -36,6 +36,14 @@ pub struct LabelWidget {
/// **Default**: `horizontal`
#[serde(default)]
orientation: ModuleOrientation,
/// The justification (alignment) of the label text.
///
/// **Valid options**: `left`, `right`, `center`, `fill`
/// <br>
/// **Default**: `left`
#[serde(default)]
justify: ModuleJustification
}
impl CustomWidget for LabelWidget {
@ -45,6 +53,7 @@ impl CustomWidget for LabelWidget {
let label = build!(self, Self::Widget);
label.set_angle(self.orientation.to_angle());
label.set_justify(self.justify.into());
label.set_use_markup(true);
{