Skip to content

Commit 68ccc7a

Browse files
authored
Merge pull request #861 from JakeStanger/fix/volume-markup
feat(volume): add pango support to button
2 parents 814fbc2 + 5e7e741 commit 68ccc7a

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

src/modules/volume.rs

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use crate::clients::volume::{self, Event};
22
use crate::config::CommonConfig;
3-
use crate::gtk_helpers::IronbarGtkExt;
3+
use crate::gtk_helpers::{IronbarGtkExt, IronbarLabelExt};
44
use crate::modules::{
55
Module, ModuleInfo, ModuleParts, ModulePopup, ModuleUpdateEvent, PopupButton, WidgetContext,
66
};
@@ -202,7 +202,13 @@ impl Module<Button> for VolumeModule {
202202
where
203203
<Self as Module<Button>>::SendMessage: Clone,
204204
{
205+
let button_label = Label::builder()
206+
.use_markup(true)
207+
.angle(info.bar_position.get_angle())
208+
.build();
209+
205210
let button = Button::new();
211+
button.add(&button_label);
206212

207213
{
208214
let tx = context.tx.clone();
@@ -215,7 +221,6 @@ impl Module<Button> for VolumeModule {
215221
{
216222
let rx = context.subscribe();
217223
let icons = self.icons.clone();
218-
let button = button.clone();
219224

220225
let format = self.format.clone();
221226

@@ -227,7 +232,7 @@ impl Module<Button> for VolumeModule {
227232
.replace("{percentage}", &sink.volume.to_string())
228233
.replace("{name}", &sink.description);
229234

230-
button.set_label(&label);
235+
button_label.set_label_escaped(&label);
231236
},
232237
_ => {}
233238
}

0 commit comments

Comments
 (0)