From 0a250fee969b79bd48193e7abddef592322da223 Mon Sep 17 00:00:00 2001
From: Alf Gaida <agaida@siduction.org>
Date: Sun, 5 Nov 2017 01:49:46 +0100
Subject: [PATCH] ported back some cosmetics (volume % and clock size) (Closes:
 #880150)

---
 debian/changelog                      |  7 ++++++
 debian/patches/clock-and-volume.patch | 31 +++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 3 files changed, 39 insertions(+)
 create mode 100644 debian/patches/clock-and-volume.patch
 create mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index adb1b7d..c00632d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lxqt-panel (0.12.0-4) experimental; urgency=medium
+
+  * ported back some cosmetics (volume % and clock size) 
+    (Closes: #880150)
+
+ -- Alf Gaida <agaida@siduction.org>  Sun, 05 Nov 2017 01:49:39 +0100
+
 lxqt-panel (0.12.0-3) experimental; urgency=medium
 
   * Fixed host OS query in rules - we really want to know the system
diff --git a/debian/patches/clock-and-volume.patch b/debian/patches/clock-and-volume.patch
new file mode 100644
index 0000000..62912f9
--- /dev/null
+++ b/debian/patches/clock-and-volume.patch
@@ -0,0 +1,31 @@
+Description: some cosmetics backported
+ - display volume percent 
+ - fix worldclock size
+
+Author: Alf Gaida <agaida@siduction.org>
+Last-Update: 2017-11-05
+
+--- lxqt-panel-0.12.0.orig/plugin-volume/lxqtvolume.cpp
++++ lxqt-panel-0.12.0/plugin-volume/lxqtvolume.cpp
+@@ -286,7 +286,7 @@ void LXQtVolume::showNotification(bool f
+             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%").arg(QString::number(m_defaultSink->volume())));
+             m_notification->update();
+         }
+     }
+--- lxqt-panel-0.12.0.orig/plugin-worldclock/lxqtworldclock.cpp
++++ lxqt-panel-0.12.0/plugin-worldclock/lxqtworldclock.cpp
+@@ -132,7 +132,10 @@ void LXQtWorldClock::updateTimeText()
+ 
+     if (!isUpToDate)
+     {
++        const QSize old_size = mContent->sizeHint();
+         mContent->setText(tzNow.toString(preformat(mFormat, timeZone, tzNow)));
++        if (old_size != mContent->sizeHint())
++            mRotatedWidget->adjustContentSize();
+         mRotatedWidget->update();
+         updatePopupContent();
+     }
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c1753e0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+clock-and-volume.patch