Reload icon when tray size changes

This partially resolves Bug 1248
pull/1/head
Timothy Pearson 12 years ago
parent 989ae9f31b
commit ea31ec697b

@ -233,7 +233,7 @@ void kpowersave::initMenu() {
void kpowersave::resizeEvent ( TQResizeEvent * ) void kpowersave::resizeEvent ( TQResizeEvent * )
{ {
// Honor Free Desktop specifications that allow for arbitrary system tray icon sizes // Honor Free Desktop specifications that allow for arbitrary system tray icon sizes
loadIcon(); loadIcon(true);
drawIcon(); drawIcon();
} }
@ -304,7 +304,7 @@ void kpowersave::showConfigureNotificationsDialog() {
* To reduce the systemload the icons are only reloaded if \ref pixmap_name * To reduce the systemload the icons are only reloaded if \ref pixmap_name
* is changed. * is changed.
*/ */
void kpowersave::loadIcon(){ void kpowersave::loadIcon(bool forceReload){
kdDebugFuncIn(trace); kdDebugFuncIn(trace);
TQString pixmap_name_tmp = "NONE"; TQString pixmap_name_tmp = "NONE";
@ -352,7 +352,7 @@ void kpowersave::loadIcon(){
} }
// reload icon only if new icon selected // 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; pixmap_name = pixmap_name_tmp;
if (pixmap_name.startsWith("ERROR")) { if (pixmap_name.startsWith("ERROR")) {
pixmap = SmallIcon("laptoppower", width(), KIcon::DisabledState); pixmap = SmallIcon("laptoppower", width(), KIcon::DisabledState);

@ -285,7 +285,7 @@ private:
//! to intialise the menu for the kickerapplet //! to intialise the menu for the kickerapplet
void initMenu(); void initMenu();
//! load the icon for \ref redrawPixmap() //! load the icon for \ref redrawPixmap()
void loadIcon(); void loadIcon(bool forceReload = false);
//! draw/redraw the icon for the kickerapplet //! draw/redraw the icon for the kickerapplet
void redrawPixmap(); void redrawPixmap();
//! to set the screensaver settings //! to set the screensaver settings

Loading…
Cancel
Save