summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Bruder <[email protected]>2017-04-28 10:12:41 +0200
committerraveit65 <[email protected]>2017-06-16 14:41:24 +0200
commit2a213e4b36abf3d5bab853a9ede50080bf1d7f86 (patch)
tree67d00cc85c26e5b7bd0fbb32b292f0ae00f6464e
parent8e7dc3287371acca17911a6a118c8ea5570de735 (diff)
downloadmate-media-2a213e4b36abf3d5bab853a9ede50080bf1d7f86.tar.bz2
mate-media-2a213e4b36abf3d5bab853a9ede50080bf1d7f86.tar.xz
applet: show volume in popup even when muted
-rw-r--r--mate-volume-control/gvc-stream-status-icon.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/mate-volume-control/gvc-stream-status-icon.c b/mate-volume-control/gvc-stream-status-icon.c
index 2620c8b..c5f0115 100644
--- a/mate-volume-control/gvc-stream-status-icon.c
+++ b/mate-volume-control/gvc-stream-status-icon.c
@@ -415,33 +415,33 @@ update_icon (GvcStreamStatusIcon *icon)
description = mate_mixer_stream_control_get_label (icon->priv->control);
+ guint volume_percent = (guint) round (100.0 * volume / normal);
if (muted) {
- markup = g_strdup_printf ("<b>%s: %s</b>\n<small>%s</small>",
+ markup = g_strdup_printf ("<b>%s: %s %u%%</b>\n<small>%s</small>",
icon->priv->display_name,
- _("Muted"),
+ _("Muted at"),
+ volume_percent,
description);
} else if (flags & MATE_MIXER_STREAM_CONTROL_VOLUME_READABLE) {
- guint display_volume = (guint) round (100.0 * volume / normal);
-
if (flags & MATE_MIXER_STREAM_CONTROL_HAS_DECIBEL) {
if (decibel > -MATE_MIXER_INFINITY) {
markup = g_strdup_printf ("<b>%s: %u%%</b>\n"
"<small>%0.2f dB\n%s</small>",
icon->priv->display_name,
- display_volume,
+ volume_percent,
decibel,
description);
} else {
markup = g_strdup_printf ("<b>%s: %u%%</b>\n"
"<small>-&#8734; dB\n%s</small>",
icon->priv->display_name,
- display_volume,
+ volume_percent,
description);
}
} else {
markup = g_strdup_printf ("<b>%s: %u%%</b>\n<small>%s</small>",
icon->priv->display_name,
- display_volume,
+ volume_percent,
description);
}
} else {