summaryrefslogtreecommitdiffstats
path: root/klipper
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-17 21:18:01 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-17 21:18:01 +0000
commit4e9fd5f6e0d8c8c35087eb40939730b93ec8d108 (patch)
tree75b7e12c9747e273b76f14a275e55ea8e31ad739 /klipper
parenteac7424f22a70f39c7b57d2beeb87c4a7cd7e93d (diff)
downloadtdebase-4e9fd5f6e0d8c8c35087eb40939730b93ec8d108.tar.gz
tdebase-4e9fd5f6e0d8c8c35087eb40939730b93ec8d108.zip
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
Diffstat (limited to 'klipper')
-rw-r--r--klipper/toplevel.cpp7
-rw-r--r--klipper/toplevel.h4
2 files changed, 8 insertions, 3 deletions
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;