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

[chaz/openbox] / openbox / framerender.c

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 ?