diff options
author | Slávek Banko <slavek.banko@axis.cz> | 2016-09-28 16:35:05 +0200 |
---|---|---|
committer | Slávek Banko <slavek.banko@axis.cz> | 2016-09-28 16:35:05 +0200 |
commit | 6bd9497d8e3802328fb8ffb864fe6ad9d3f392e8 (patch) | |
tree | 7a56c39afcc43c71cee7808da2326a788f9563b7 | |
parent | 1757afecf639d23eb03a22104a71716c85bec23e (diff) | |
download | tdebase-6bd9497d8e3802328fb8ffb864fe6ad9d3f392e8.tar.gz tdebase-6bd9497d8e3802328fb8ffb864fe6ad9d3f392e8.zip |
Fix too small size of some icons in system tray
This resolves bug 2687
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r-- | kicker/applets/systemtray/systemtrayapplet.cpp | 20 | ||||
-rw-r--r-- | kicker/applets/systemtray/systemtrayapplet.h | 1 |
2 files changed, 2 insertions, 19 deletions
diff --git a/kicker/applets/systemtray/systemtrayapplet.cpp b/kicker/applets/systemtray/systemtrayapplet.cpp index 59e212611..97b71d1b2 100644 --- a/kicker/applets/systemtray/systemtrayapplet.cpp +++ b/kicker/applets/systemtray/systemtrayapplet.cpp @@ -558,9 +558,9 @@ void SystemTrayApplet::embedWindow( WId w, bool kde_tray ) delete emb; return; } - + connect(emb, TQT_SIGNAL(embeddedWindowDestroyed()), TQT_SLOT(updateTrayWindows())); - emb->getIconSize(m_iconSize); + emb->setFixedSize(m_iconSize, m_iconSize); if (shouldHide(w)) { @@ -1153,22 +1153,6 @@ TrayEmbed::~TrayEmbed() // } -void TrayEmbed::getIconSize(int defaultIconSize) -{ - TQSize minSize = minimumSizeHint(); - - int width = minSize.width(); - int height = minSize.height(); - - if (width < 1 || width > defaultIconSize) - width = defaultIconSize; - if (height < 1 || height > defaultIconSize) - height = defaultIconSize; - - setFixedSize(width, height); - setBackground(); -} - void TrayEmbed::setBackground() { const TQPixmap *pbg = parentWidget()->backgroundPixmap(); diff --git a/kicker/applets/systemtray/systemtrayapplet.h b/kicker/applets/systemtray/systemtrayapplet.h index 250480b65..e311a1bdd 100644 --- a/kicker/applets/systemtray/systemtrayapplet.h +++ b/kicker/applets/systemtray/systemtrayapplet.h @@ -131,7 +131,6 @@ public: ~TrayEmbed(); bool kdeTray() const { return kde_tray; } void setBackground(); - void getIconSize(int defaultIconSize); private: bool kde_tray; TQWidget *m_scaledWidget; |