From kde-commits  Wed Jun 24 16:57:41 2009
From: =?utf-8?q?Aaron=20J=2E=20Seigo?= <aseigo () kde ! org>
Date: Wed, 24 Jun 2009 16:57:41 +0000
To: kde-commits
Subject: KDE/kdebase/workspace/plasma/applets/quicklaunch
Message-Id: <1245862661.057903.14807.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=124586266810632

SVN commit 986460 by aseigo:

let iconwidget do the painting, based on a patch by 潘卫平
CCMAIL:wppan@redflag-linux.com


 M  +6 -11     quicklaunchIcon.cpp  


--- trunk/KDE/kdebase/workspace/plasma/applets/quicklaunch/quicklaunchIcon.cpp #986459:986460
@@ -68,17 +68,12 @@
 {
     painter->setClipRect(option->rect);
     QRect rect = option->rect;
-    rect.setSize(QSize(m_iconSize, m_iconSize));
-    //rect.moveCenter(option->rect.center());
-    rect.moveCenter(QPoint(option->rect.width() / 2, option->rect.height() / 2));
-    //rect.setLeft((option->rect.width() - m_iconSize) / 2);
-    //rect.setTop((option->rect.height() - m_iconSize) / 2);
-    //QStyleOptionGraphicsItem opt = *option;
-    //opt.rect = rect;
-    //kDebug() << "Paint to:" << rect << "Original rect was:" << option->rect;
-
-    painter->drawPixmap(rect, icon().pixmap(m_iconSize));
-    //IconWidget::paint(painter, &opt, widget);
+    // the magic 2 is to make up for the 1px border around Plasma::IconWidgets
+    rect.setSize(QSize(m_iconSize + 2, m_iconSize + 2));
+    rect.moveCenter(option->rect.center());
+    QStyleOptionGraphicsItem opt = *option;
+    opt.rect = rect;
+    IconWidget::paint(painter, &opt, widget);
 }
 
 void QuicklaunchIcon::execute()