JakeStanger/ironbar
1
1
Fork 0
mirror of https://github.com/JakeStanger/ironbar.git synced 2024-10-05 18:58:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Fix Pango markup not escaped"

Browse Source
This commit is contained in:
Jake Stanger 2024-06-02 17:42:18 +01:00 committed by GitHub
parent 0085e51ff6
commit a9a32817e0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 23 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dynamic_value/dynamic_string.rs
View File

@ -22,7 +22,7 @@ enum DynamicStringSegment {
///
/// ```rs
/// dynamic_string(&text, move |string| {
/// label.set_markup_escaped(&string);
/// label.set_markup(&string);
/// });
/// ```
pub fn dynamic_string<F>(input: &str, mut f: F)

17
src/gtk_helpers.rs
View File

@ -1,6 +1,6 @@
use glib::{markup_escape_text, IsA};
use glib::IsA;
use gtk::prelude::*;
use gtk::{Label, Orientation, Widget};
use gtk::{Orientation, Widget};
/// Represents a widget's size
/// and location relative to the bar's start edge.
@ -75,16 +75,3 @@ impl<W: IsA<Widget>> IronbarGtkExt for W {
unsafe { self.set_data(key, value) }
}
}
pub trait IronbarLabelExt {
/// Sets a label's pango markup, escaping it in the process.
/// This should be used for any label values
/// which could contain special characters, for example `&`.
fn set_markup_escaped(&self, text: &str);
}
impl IronbarLabelExt for Label {
fn set_markup_escaped(&self, text: &str) {
self.set_markup(markup_escape_text(text).as_str())
}
}

4
src/modules/clock.rs
View File

@ -9,7 +9,7 @@ use tokio::sync::{broadcast, mpsc};
use tokio::time::sleep;
use crate::config::{CommonConfig, ModuleOrientation};
use crate::gtk_helpers::{IronbarGtkExt, IronbarLabelExt};
use crate::gtk_helpers::IronbarGtkExt;
use crate::modules::{
Module, ModuleInfo, ModuleParts, ModulePopup, ModuleUpdateEvent, PopupButton, WidgetContext,
};
@ -143,7 +143,7 @@ impl Module<Button> for ClockModule {
let rx = context.subscribe();
glib_recv!(rx, date => {
let date_string = format!("{}", date.format_localized(&format, locale));
label.set_markup_escaped(&date_string);
label.set_label(&date_string);
});
let popup = self

3
src/modules/custom/button.rs
View File

@ -4,7 +4,6 @@ use serde::Deserialize;
use crate::config::ModuleOrientation;
use crate::dynamic_value::dynamic_string;
use crate::gtk_helpers::IronbarLabelExt;
use crate::modules::PopupButton;
use crate::{build, try_send};
@ -76,7 +75,7 @@ impl CustomWidget for ButtonWidget {
button.add(&label);
dynamic_string(&text, move |string| {
label.set_markup_escaped(&string);
label.set_markup(&string);
});
}

3
src/modules/custom/label.rs
View File

@ -5,7 +5,6 @@ use serde::Deserialize;
use crate::build;
use crate::config::ModuleOrientation;
use crate::dynamic_value::dynamic_string;
use crate::gtk_helpers::IronbarLabelExt;
use super::{CustomWidget, CustomWidgetContext};
@ -51,7 +50,7 @@ impl CustomWidget for LabelWidget {
{
let label = label.clone();
dynamic_string(&self.label, move |string| {
label.set_markup_escaped(&string);
label.set_markup(&string);
});
}

2
src/modules/focused.rs
View File

@ -165,7 +165,7 @@ impl Module<gtk::Box> for FocusedModule {
if self.show_title {
label.show();
label.set_text(&name);
label.set_label(&name);
}
} else {
icon.hide();

3
src/modules/label.rs
View File

@ -1,6 +1,5 @@
use crate::config::CommonConfig;
use crate::dynamic_value::dynamic_string;
use crate::gtk_helpers::IronbarLabelExt;
use crate::modules::{Module, ModuleInfo, ModuleParts, ModuleUpdateEvent, WidgetContext};
use crate::{glib_recv, module_impl, try_send};
use color_eyre::Result;
@ -62,7 +61,7 @@ impl Module<Label> for LabelModule {
{
let label = label.clone();
glib_recv!(context.subscribe(), string => label.set_markup_escaped(&string));
glib_recv!(context.subscribe(), string => label.set_markup(&string));
}
Ok(ModuleParts {

10
src/modules/music/mod.rs
View File

@ -5,7 +5,7 @@ use std::sync::Arc;
use std::time::Duration;
use color_eyre::Result;
use glib::{markup_escape_text, Propagation, PropertySet};
use glib::{Propagation, PropertySet};
use gtk::prelude::*;
use gtk::{Button, IconTheme, Label, Orientation, Scale};
use regex::Regex;
@ -16,7 +16,7 @@ use crate::clients::music::{
self, MusicClient, PlayerState, PlayerUpdate, ProgressTick, Status, Track,
};
use crate::clients::Clients;
use crate::gtk_helpers::{IronbarGtkExt, IronbarLabelExt};
use crate::gtk_helpers::IronbarGtkExt;
use crate::image::{new_icon_button, new_icon_label, ImageProvider};
use crate::modules::PopupButton;
use crate::modules::{
@ -222,7 +222,7 @@ impl Module<Button> for MusicModule {
};
if let Some(event) = event.take() {
label.set_markup_escaped(&event.display_string);
label.set_label(&event.display_string);
button.show();
@ -473,7 +473,7 @@ impl Module<Button> for MusicModule {
if let (Some(elapsed), Some(duration)) =
(progress_tick.elapsed, progress_tick.duration)
{
progress_label.set_text(&format!(
progress_label.set_label(&format!(
"{}/{}",
format_time(elapsed),
format_time(duration)
@ -549,7 +549,7 @@ impl IconLabel {
let mut builder = Label::builder().use_markup(true);
if let Some(label) = label {
builder = builder.label(markup_escape_text(label));
builder = builder.label(label);
}
let label = builder.build();

2
src/modules/notifications.rs
View File

@ -210,7 +210,7 @@ impl Module<Overlay> for NotificationsModule {
let icon = self.icons.icon(ev);
button.set_label(icon);
label.set_text(&ev.count.to_string());
label.set_label(&ev.count.to_string());
label.set_visible(self.show_count && ev.count > 0);
});
}

3
src/modules/script.rs
View File

@ -1,5 +1,4 @@
use crate::config::CommonConfig;
use crate::gtk_helpers::IronbarLabelExt;
use crate::modules::{Module, ModuleInfo, ModuleParts, ModuleUpdateEvent, WidgetContext};
use crate::script::{OutputStream, Script, ScriptMode};
use crate::{glib_recv, module_impl, spawn, try_send};
@ -104,7 +103,7 @@ impl Module<Label> for ScriptModule {
{
let label = label.clone();
glib_recv!(context.subscribe(), s => label.set_markup_escaped(s.as_str()));
glib_recv!(context.subscribe(), s => label.set_markup(s.as_str()));
}
Ok(ModuleParts {

4
src/modules/sysinfo.rs
View File

@ -1,5 +1,5 @@
use crate::config::{CommonConfig, ModuleOrientation};
use crate::gtk_helpers::{IronbarGtkExt, IronbarLabelExt};
use crate::gtk_helpers::IronbarGtkExt;
use crate::modules::{Module, ModuleInfo, ModuleParts, ModuleUpdateEvent, WidgetContext};
use crate::{glib_recv, module_impl, send_async, spawn};
use color_eyre::Result;
@ -266,7 +266,7 @@ impl Module<gtk::Box> for SysInfoModule {
.to_string()
});
label.set_markup_escaped(format_compiled.as_ref());
label.set_markup(format_compiled.as_ref());
}
});
}

2
src/modules/tray/interface.rs
View File

@ -124,7 +124,7 @@ impl TrayMenu {
label.show();
label
})
.set_text(text);
.set_label(text);
}
/// Shows the label, using its current text.

6
src/modules/upower.rs
View File

@ -9,7 +9,7 @@ use zbus;
use zbus::fdo::PropertiesProxy;
use crate::config::CommonConfig;
use crate::gtk_helpers::{IronbarGtkExt, IronbarLabelExt};
use crate::gtk_helpers::IronbarGtkExt;
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_escaped(format.as_ref());
label.set_markup(format.as_ref());
});
let rx = context.subscribe();
@ -263,7 +263,7 @@ impl Module<gtk::Button> for UpowerModule {
_ => String::new(),
};
label.set_markup_escaped(&format);
label.set_markup(&format);
});
container.show_all();

2
src/modules/volume.rs
View File

@ -432,7 +432,7 @@ impl Module<Button> for VolumeModule {
}
Event::UpdateInput(info) => {
if let Some(ui) = inputs.get(&info.index) {
ui.label.set_text(&info.name);
ui.label.set_label(&info.name);
ui.slider.set_value(info.volume);
ui.slider.set_sensitive(info.can_set_volume);
ui.btn_mute.set_label(if info.muted { &self.icons.muted } else { self.icons.volume_icon(info.volume) });