diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-10-11 11:52:57 -0500 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-01-01 00:55:47 +0100 |
| commit | 6bc71c514101ff8ff5d283cb091a531ee7c4159c (patch) | |
| tree | f1c3b4f220651c01be572adcc1979cedfc1fc4ed | |
| parent | de14cb88f915e1e818d52e76a7228adddfdf387a (diff) | |
| download | kpowersave-6bc71c514101ff8ff5d283cb091a531ee7c4159c.tar.gz kpowersave-6bc71c514101ff8ff5d283cb091a531ee7c4159c.zip | |
Reload icon when tray size changes
This partially resolves Bug 1248
(cherry picked from commit 301ec19388d7cc8e4c7897257cfbd10cb38f1679)
| -rw-r--r-- | src/kpowersave.cpp | 6 | ||||
| -rw-r--r-- | src/kpowersave.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/kpowersave.cpp b/src/kpowersave.cpp index 17fd332..b80a823 100644 --- a/src/kpowersave.cpp +++ b/src/kpowersave.cpp @@ -239,7 +239,7 @@ void kpowersave::initMenu() { void kpowersave::resizeEvent ( TQResizeEvent * ) { // Honor Free Desktop specifications that allow for arbitrary system tray icon sizes - loadIcon(); + loadIcon(true); drawIcon(); } @@ -310,7 +310,7 @@ void kpowersave::showConfigureNotificationsDialog() { * To reduce the systemload the icons are only reloaded if \ref pixmap_name * is changed. */ -void kpowersave::loadIcon(){ +void kpowersave::loadIcon(bool forceReload){ kdDebugFuncIn(trace); TQString pixmap_name_tmp = "NONE"; @@ -358,7 +358,7 @@ void kpowersave::loadIcon(){ } // reload icon only if new icon selected - if(pixmap_name_tmp != pixmap_name) { + if ((pixmap_name_tmp != pixmap_name) || (forceReload)) { pixmap_name = pixmap_name_tmp; if (pixmap_name.startsWith("ERROR")) { pixmap = SmallIcon("laptoppower", width(), KIcon::DisabledState); diff --git a/src/kpowersave.h b/src/kpowersave.h index af0d49c..2c4067b 100644 --- a/src/kpowersave.h +++ b/src/kpowersave.h @@ -306,7 +306,7 @@ private: //! to intialise the menu for the kickerapplet void initMenu(); //! load the icon for \ref redrawPixmap() - void loadIcon(); + void loadIcon(bool forceReload = false); //! draw/redraw the icon for the kickerapplet void redrawPixmap(); //! to set the screensaver settings |