From 4e9fd5f6e0d8c8c35087eb40939730b93ec8d108 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Fri, 17 Sep 2010 21:18:01 +0000
Subject: Fixed Klipper icon size when running as applet

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1176514 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 klipper/toplevel.cpp | 7 ++++++-
 klipper/toplevel.h   | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'klipper')

diff --git a/klipper/toplevel.cpp b/klipper/toplevel.cpp
index 3d9067aab..ec8dec11a 100644
--- a/klipper/toplevel.cpp
+++ b/klipper/toplevel.cpp
@@ -196,7 +196,12 @@ KlipperWidget::KlipperWidget( TQWidget *parent, KConfig* config )
     connect( poll, TQT_SIGNAL( clipboardChanged( bool ) ),
              this, TQT_SLOT( newClipData( bool ) ) );
 
-    m_pixmap = KSystemTray::loadSizedIcon( "klipper", width() );
+    if ( isApplet() ) {
+        m_pixmap = KSystemTray::loadIcon( "klipper" );
+    }
+    else {
+        m_pixmap = KSystemTray::loadSizedIcon( "klipper", width() );
+    }
     m_iconOrigWidth = width();
     m_iconOrigHeight = height();
     adjustSize();
diff --git a/klipper/toplevel.h b/klipper/toplevel.h
index acb41b22a..7502e4c46 100644
--- a/klipper/toplevel.h
+++ b/klipper/toplevel.h
@@ -174,8 +174,8 @@ private:
     KAction* quitAction;
     TQPixmap m_pixmap;
     TQPixmap m_scaledpixmap;
-    int m_iconOrigWidth :0;
-    int m_iconOrigHeight :0;
+    int m_iconOrigWidth;
+    int m_iconOrigHeight;
     bool bPopupAtMouse :1;
     bool bKeepContents :1;
     bool bURLGrabber   :1;
-- 
cgit v1.2.3