diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2016-09-22 23:19:30 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2016-09-22 23:21:07 +0900 |
| commit | ec61487cd63fe48abecf42b7279a7c5f135fcea3 (patch) | |
| tree | a1931094419a6b990bb8643dd418a0383980a5f7 | |
| parent | 78014041e8f266c2e26c4d96b758adfa2d892ddd (diff) | |
| download | tdebase-ec61487cd63fe48abecf42b7279a7c5f135fcea3.tar.gz tdebase-ec61487cd63fe48abecf42b7279a7c5f135fcea3.zip | |
Fixed display of clock in systray. This resolves bug 2679.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit d5feffdec9e2380f9dd590607a71669dd772e319)
| -rw-r--r-- | kicker/applets/systemtray/systemtrayapplet.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
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() |