summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2016-09-28 16:35:05 +0200
committerSlávek Banko <slavek.banko@axis.cz>2016-09-28 16:35:18 +0200
commit89aa5220b6f7c4c5d43c3fdbd57d5a4c4b020763 (patch)
tree51808245f4ab0f00bad95eddfc4f596d3be4d89c
parentec61487cd63fe48abecf42b7279a7c5f135fcea3 (diff)
downloadtdebase-89aa5220b6f7c4c5d43c3fdbd57d5a4c4b020763.tar.gz
tdebase-89aa5220b6f7c4c5d43c3fdbd57d5a4c4b020763.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> (cherry picked from commit 6bd9497d8e3802328fb8ffb864fe6ad9d3f392e8)
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.cpp20
-rw-r--r--kicker/applets/systemtray/systemtrayapplet.h1
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;