correctly show pressed state when pressing toggled buttons, bug #2311

diff --git a/openbox/framerender.c b/openbox/framerender.c
index 7356a3833d99446f9796d1965fba11c34839d18d..9d32d23ade19494057540824396859c0b63a6858 100644 (file)
--- a/openbox/framerender.c
+++ b/openbox/framerender.c
@@ -91,7 +91,9 @@ void framerender_frame(ObFrame *self)
               ob_rr_theme->a_disabled_unfocused_desk) :
              (self->focused ?
               (self->client->desktop == DESKTOP_ALL ?
-               ob_rr_theme->a_toggled_focused_desk :
+               (self->desk_press ?
+                ob_rr_theme->a_toggled_focused_pressed_desk :
+                ob_rr_theme->a_toggled_focused_desk) :
                (self->desk_press ?
                 ob_rr_theme->a_focused_pressed_desk :
                 (self->desk_hover ?
@@ -110,7 +112,9 @@ void framerender_frame(ObFrame *self)
               ob_rr_theme->a_disabled_unfocused_shade) :
              (self->focused ?
               (self->client->shaded ?
-               ob_rr_theme->a_toggled_focused_shade :
+               (self->shade_press ?
+                ob_rr_theme->a_toggled_focused_pressed_shade :
+                ob_rr_theme->a_toggled_focused_shade) :
                (self->shade_press ?
                 ob_rr_theme->a_focused_pressed_shade :
                 (self->shade_hover ?

diff --git a/render/theme.c b/render/theme.c
index 3b44b525379d6656c8ee33c3a7d0c15a0711d204..ffd37c02d13a67793f6b67e98a841b26804e1d3b 100644 (file)
--- a/render/theme.c
+++ b/render/theme.c
@@ -591,6 +591,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         RrAppearanceCopy(theme->a_hover_unfocused_max); 
     theme->a_toggled_focused_desk =
         RrAppearanceCopy(theme->a_toggled_focused_max);
+    theme->a_toggled_focused_pressed_desk =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
     theme->a_toggled_unfocused_desk =
         RrAppearanceCopy(theme->a_toggled_unfocused_max);
     theme->a_unfocused_unpressed_desk =
@@ -611,6 +613,8 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         RrAppearanceCopy(theme->a_hover_unfocused_max);
     theme->a_toggled_focused_shade =
         RrAppearanceCopy(theme->a_toggled_focused_max);
+    theme->a_toggled_focused_pressed_shade =
+        RrAppearanceCopy(theme->a_focused_pressed_max);
     theme->a_toggled_unfocused_shade =
         RrAppearanceCopy(theme->a_toggled_unfocused_max);
     theme->a_unfocused_unpressed_shade =
@@ -718,6 +722,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_hover_focused_desk->texture[0].type = 
         theme->a_hover_unfocused_desk->texture[0].type = 
         theme->a_toggled_focused_desk->texture[0].type = 
+        theme->a_toggled_focused_pressed_desk->texture[0].type =
         theme->a_toggled_unfocused_desk->texture[0].type = 
         theme->a_focused_unpressed_desk->texture[0].type = 
         theme->a_focused_pressed_desk->texture[0].type = 
@@ -728,6 +733,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_hover_focused_shade->texture[0].type = 
         theme->a_hover_unfocused_shade->texture[0].type = 
         theme->a_toggled_focused_shade->texture[0].type = 
+        theme->a_toggled_focused_pressed_shade->texture[0].type = 
         theme->a_toggled_unfocused_shade->texture[0].type = 
         theme->a_focused_unpressed_shade->texture[0].type = 
         theme->a_focused_pressed_shade->texture[0].type = 
@@ -784,6 +790,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_unfocused_unpressed_desk->texture[0].data.mask.mask = 
         theme->desk_mask;
     theme->a_toggled_focused_desk->texture[0].data.mask.mask = 
+        theme->a_toggled_focused_pressed_desk->texture[0].data.mask.mask =
         theme->a_toggled_unfocused_desk->texture[0].data.mask.mask =
         theme->desk_toggled_mask;
     theme->a_disabled_focused_shade->texture[0].data.mask.mask = 
@@ -799,6 +806,7 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
         theme->a_unfocused_unpressed_shade->texture[0].data.mask.mask = 
         theme->shade_mask;
     theme->a_toggled_focused_shade->texture[0].data.mask.mask = 
+        theme->a_toggled_focused_pressed_shade->texture[0].data.mask.mask = 
         theme->a_toggled_unfocused_shade->texture[0].data.mask.mask =
         theme->shade_toggled_mask;
     theme->a_disabled_focused_iconify->texture[0].data.mask.mask = 
@@ -857,7 +865,9 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
     theme->a_focused_pressed_max->texture[0].data.mask.color = 
         theme->a_focused_pressed_close->texture[0].data.mask.color = 
         theme->a_focused_pressed_desk->texture[0].data.mask.color = 
+        theme->a_toggled_focused_pressed_desk->texture[0].data.mask.color =
         theme->a_focused_pressed_shade->texture[0].data.mask.color = 
+        theme->a_toggled_focused_pressed_shade->texture[0].data.mask.color = 
         theme->a_focused_pressed_iconify->texture[0].data.mask.color =
         theme->titlebut_focused_pressed_color;
     theme->a_unfocused_unpressed_max->texture[0].data.mask.color = 
@@ -914,7 +924,7 @@ void RrThemeFree(RrTheme *theme)
     if (theme) {
         g_free(theme->path);
         g_free(theme->name);
-
+        
         RrColorFree(theme->b_color);
         RrColorFree(theme->cb_unfocused_color);
         RrColorFree(theme->cb_focused_color);
@@ -990,6 +1000,7 @@ void RrThemeFree(RrTheme *theme)
         RrAppearanceFree(theme->a_hover_focused_desk);
         RrAppearanceFree(theme->a_hover_unfocused_desk);
         RrAppearanceFree(theme->a_toggled_focused_desk);
+        RrAppearanceFree(theme->a_toggled_focused_pressed_desk);
         RrAppearanceFree(theme->a_toggled_unfocused_desk);
         RrAppearanceFree(theme->a_focused_unpressed_desk);
         RrAppearanceFree(theme->a_focused_pressed_desk);
@@ -1000,6 +1011,7 @@ void RrThemeFree(RrTheme *theme)
         RrAppearanceFree(theme->a_hover_focused_shade);
         RrAppearanceFree(theme->a_hover_unfocused_shade);
         RrAppearanceFree(theme->a_toggled_focused_shade);
+        RrAppearanceFree(theme->a_toggled_focused_pressed_shade);
         RrAppearanceFree(theme->a_toggled_unfocused_shade);
         RrAppearanceFree(theme->a_focused_unpressed_shade);
         RrAppearanceFree(theme->a_focused_pressed_shade);

diff --git a/render/theme.h b/render/theme.h
index f61944b7bde4b2f008499c6117ec83eb848be9d7..41f83e2c895f15d323a58926926110291690d70f 100644 (file)
--- a/render/theme.h
+++ b/render/theme.h
@@ -131,6 +131,7 @@ struct _RrTheme {
     RrAppearance *a_hover_focused_desk;
     RrAppearance *a_hover_unfocused_desk;
     RrAppearance *a_toggled_focused_desk;
+    RrAppearance *a_toggled_focused_pressed_desk;
     RrAppearance *a_toggled_unfocused_desk;
     RrAppearance *a_focused_unpressed_desk;
     RrAppearance *a_focused_pressed_desk;
@@ -141,6 +142,7 @@ struct _RrTheme {
     RrAppearance *a_hover_focused_shade;
     RrAppearance *a_hover_unfocused_shade;
     RrAppearance *a_toggled_focused_shade;
+    RrAppearance *a_toggled_focused_pressed_shade;
     RrAppearance *a_toggled_unfocused_shade;
     RrAppearance *a_focused_unpressed_shade;
     RrAppearance *a_focused_pressed_shade;