Reload icon when tray size changes

This partially resolves Bug 1248

src/kpowersave.cpp

@@ -233,7 +233,7 @@ void kpowersave::initMenu() {
 void kpowersave::resizeEvent ( TQResizeEvent * )
 {
 	// Honor Free Desktop specifications that allow for arbitrary system tray icon sizes
-	loadIcon();
+	loadIcon(true);
 	drawIcon();
 }
 
@@ -304,7 +304,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";
@@ -352,7 +352,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);

src/kpowersave.h

@@ -285,7 +285,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