From d5feffdec9e2380f9dd590607a71669dd772e319 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 22 Sep 2016 23:19:30 +0900 Subject: Fixed display of clock in systray. This resolves bug 2679. Signed-off-by: Michele Calgaro --- kicker/applets/systemtray/systemtrayapplet.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'kicker/applets') diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 41d5af10b..59e212611 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -100,6 +100,7 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac m_clockApplet = new ClockApplet(configFile, KPanelApplet::Normal, KPanelApplet::Preferences, this, "clockapplet"); updateClockGeometry(); connect(m_clockApplet, TQT_SIGNAL(clockReconfigured()), this, TQT_SLOT(updateClockGeometry())); + connect(m_clockApplet, TQT_SIGNAL(updateLayout()), this, TQT_SLOT(updateClockGeometry())); setBackgroundOrigin(AncestorOrigin); @@ -116,7 +117,17 @@ SystemTrayApplet::SystemTrayApplet(const TQString& configFile, Type type, int ac void SystemTrayApplet::updateClockGeometry() { if (m_clockApplet) - m_clockApplet->setFixedSize(m_clockApplet->widthForHeight(height()-2),height()-2); + { + m_clockApplet->setPosition(position()); + if (orientation() == Qt::Horizontal) + { + m_clockApplet->setFixedSize(m_clockApplet->widthForHeight(height()),height()); + } + else + { + m_clockApplet->setFixedSize(width(),m_clockApplet->heightForWidth(width())); + } + } } void SystemTrayApplet::initialize() -- cgit v1.2.1