diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2005-07-14 13:02:39 +0000 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2005-07-14 13:02:39 +0000 |
| commit | 5c95d2ffeabe45a6aacf37d0a1c1b0dfe83b2ba5 (patch) | |
| tree | 041115a8efaa18b17ab67b08a136aaef53d1fd0c /render/theme.c | |
| parent | d2c98faf78cc691ae96e8ddcbb866a604a0ac9a5 (diff) | |
correctly show pressed state when pressing toggled buttons, bug #2311
Diffstat (limited to 'render/theme.c')
| -rw-r--r-- | render/theme.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/render/theme.c b/render/theme.c index 3b44b525..ffd37c02 100644 --- 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); |