Part of batch commit to enable true tasktray resize support for Trinity applications

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1124757 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 15 insertions, 1 deletions

diff --git a/kcontrol/randr/krandrtray.cpp b/kcontrol/randr/krandrtray.cpp
index adfe48e5f..8b230ba74 100644
--- a/kcontrol/randr/krandrtray.cpp
+++ b/kcontrol/randr/krandrtray.cpp
@@ -51,7 +51,7 @@ KRandRSystemTray::KRandRSystemTray(QWidget* parent, const char *name)
 	, m_popupUp(false)
 	, m_help(new KHelpMenu(this, KGlobal::instance()->aboutData(), false, actionCollection()))
 {
-	setPixmap(KSystemTray::loadIcon("randr"));
+	setPixmap(KSystemTray::loadSizedIcon("randr", width()));
 	setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
 	connect(this, SIGNAL(quitSelected()), kapp, SLOT(quit()));
 	QToolTip::add(this, i18n("Screen resize & rotate"));
@@ -88,6 +88,19 @@ KRandRSystemTray::KRandRSystemTray(QWidget* parent, const char *name)
 	}
 }
 
+void KRandRSystemTray::resizeEvent ( QResizeEvent * )
+{
+	// Honor Free Desktop specifications that allow for arbitrary system tray icon sizes
+	QPixmap origpixmap;
+	QPixmap scaledpixmap;
+	QImage newIcon;
+	origpixmap = KSystemTray::loadSizedIcon( "randr", width() );
+	newIcon = origpixmap;
+	newIcon = newIcon.smoothScale(width(), height());
+	scaledpixmap = newIcon;
+	setPixmap(scaledpixmap);
+}
+
 void KRandRSystemTray::mousePressEvent(QMouseEvent* e)
 {
 	// Popup the context menu with left-click
diff --git a/kcontrol/randr/krandrtray.h b/kcontrol/randr/krandrtray.h
index d34c85071..145fb89b0 100644
--- a/kcontrol/randr/krandrtray.h
+++ b/kcontrol/randr/krandrtray.h
@@ -59,6 +59,7 @@ protected slots:
 
 protected:
 	void mousePressEvent( QMouseEvent *e );
+	void resizeEvent ( QResizeEvent * );
 
 private:
 	void populateMenu(KPopupMenu* menu);