diff --git a/debian/changelog b/debian/changelog index c9e257d..f3d54d4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ lxqt-panel (0.13.0-0ubuntu3) UNRELEASED; urgency=medium * Add a DEP-3 header for the patch completely removing the clock plugin. + * Don't auto-unmute the volume when it's changed. -- Simon Quigley Mon, 16 Jul 2018 21:38:55 -0500 diff --git a/debian/patches/don't-autounmute-on-volume-change.patch b/debian/patches/don't-autounmute-on-volume-change.patch new file mode 100644 index 0000000..8438bf6 --- /dev/null +++ b/debian/patches/don't-autounmute-on-volume-change.patch @@ -0,0 +1,30 @@ +Description: volume: Do not auto-unmute on volume change +Author: Palo Kisa +Origin: upstream +Bug: https://github.com/lxqt/lxqt/issues/1520 +Applied-Upstream: commit:41259bb +Last-Update: 2018-07-16 +--- a/plugin-volume/audiodevice.cpp ++++ b/plugin-volume/audiodevice.cpp +@@ -114,7 +114,6 @@ void AudioDevice::setVolume(int volume) + return; + + setVolumeNoCommit(volume); +- setMute(false); + + if (m_engine) + m_engine->commitDeviceVolume(this); +--- a/plugin-volume/lxqtvolume.cpp ++++ b/plugin-volume/lxqtvolume.cpp +@@ -283,10 +283,7 @@ void LXQtVolume::showNotification(bool f + { + if (Q_LIKELY(m_defaultSink)) + { +- if (m_defaultSink->mute()) +- m_notification->setSummary(tr("Volume: muted")); +- else +- m_notification->setSummary(tr("Volume: %1%").arg(QString::number(m_defaultSink->volume()))); ++ m_notification->setSummary(tr("Volume: %1%%2").arg(QString::number(m_defaultSink->volume())).arg(m_defaultSink->mute() ? tr("(muted)") : "")); + m_notification->update(); + } + } diff --git a/debian/patches/series b/debian/patches/series index 675836c..709a30e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ completely-remove-plugin-clock.patch +don't-autounmute-on-volume-change.patch