1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-17 14:51:04 +02:00

fix: markup escape issues

Fixes #629
This commit is contained in:
Jake Stanger 2024-10-15 22:10:37 +01:00
parent 56153f189a
commit b2db7b0bb5
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
10 changed files with 51 additions and 30 deletions

View file

@ -9,7 +9,7 @@ use zbus;
use zbus::fdo::PropertiesProxy;
use crate::config::CommonConfig;
use crate::gtk_helpers::IronbarGtkExt;
use crate::gtk_helpers::{IronbarGtkExt, IronbarLabelExt};
use crate::image::ImageProvider;
use crate::modules::PopupButton;
use crate::modules::{
@ -212,7 +212,7 @@ impl Module<gtk::Button> for UpowerModule {
ImageProvider::parse(&icon_name, &icon_theme, false, self.icon_size)
.map(|provider| provider.load_into_image(icon.clone()));
label.set_markup(format.as_ref());
label.set_label_escaped(&format);
});
let rx = context.subscribe();
@ -237,7 +237,7 @@ impl Module<gtk::Button> for UpowerModule {
.orientation(Orientation::Horizontal)
.build();
let label = Label::new(None);
let label = Label::builder().use_markup(true).build();
label.add_class("upower-details");
container.add(&label);
@ -263,7 +263,7 @@ impl Module<gtk::Button> for UpowerModule {
_ => String::new(),
};
label.set_markup(&format);
label.set_label_escaped(&format);
});
container.show_all();