all repos — fluxbox @ 59a806799ffda3ff2bc3bf7a2c0942c5edb8dbfa

custom fork of the fluxbox windowmanager 

when the app changes its pixmap we need to trigger that correctly
mathias mathias
commit

59a806799ffda3ff2bc3bf7a2c0942c5edb8dbfa

parent

41462f08d2ada06896c77fe2b9ee9e3fb81a354c

1 files changed, 12 insertions(+), 0 deletions(-)

jump to
M src/WinButton.cc → src/WinButton.cc 
@@ -354,10 +354,22 @@ if (hints == 0) {
             m_icon_pixmap.release();
             m_icon_mask.release();
         } else {
+
+            // no pixmap
             if (!((hints->flags & IconPixmapHint) && hints->icon_pixmap != 0))
                 m_icon_pixmap.release();
+
+            // pixmap has changed
+            if (hints->flags & IconPixmapHint && hints->icon_pixmap != 0 && 
+                    hints->icon_pixmap != m_icon_pixmap.drawable())
+                m_icon_pixmap.release();
             
+            // no pixmap-mask
             if (!(hints->flags & IconMaskHint))
+                m_icon_mask.release();
+
+            // pixmap-mask has changed
+            if (hints->flags & IconMaskHint && hints->icon_mask != m_icon_mask.drawable())
                 m_icon_mask.release();
         }