zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-17 14:51:04 +02:00
Code 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
Download patch file Download diff file Expand all files Collapse all files

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();