diff options
| -rw-r--r-- | openbox/framerender.c | 8 | ||||
| -rw-r--r-- | render/theme.c | 14 | ||||
| -rw-r--r-- | render/theme.h | 2 |
3 files changed, 3 insertions, 21 deletions
diff --git a/openbox/framerender.c b/openbox/framerender.c index 9d32d23a..7356a383 100644 --- a/openbox/framerender.c +++ b/openbox/framerender.c @@ -91,9 +91,7 @@ void framerender_frame(ObFrame *self) ob_rr_theme->a_disabled_unfocused_desk) : (self->focused ? (self->client->desktop == DESKTOP_ALL ? - (self->desk_press ? - ob_rr_theme->a_toggled_focused_pressed_desk : - ob_rr_theme->a_toggled_focused_desk) : + ob_rr_theme->a_toggled_focused_desk : (self->desk_press ? ob_rr_theme->a_focused_pressed_desk : (self->desk_hover ? @@ -112,9 +110,7 @@ void framerender_frame(ObFrame *self) ob_rr_theme->a_disabled_unfocused_shade) : (self->focused ? (self->client->shaded ? - (self->shade_press ? - ob_rr_theme->a_toggled_focused_pressed_shade : - ob_rr_theme->a_toggled_focused_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 ffd37c02..3b44b525 100644 --- a/render/theme.c +++ b/render/theme.c @@ -591,8 +591,6 @@ 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 = @@ -613,8 +611,6 @@ 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 = @@ -722,7 +718,6 @@ 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 = @@ -733,7 +728,6 @@ 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 = @@ -790,7 +784,6 @@ 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 = @@ -806,7 +799,6 @@ 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 = @@ -865,9 +857,7 @@ 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 = @@ -924,7 +914,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); @@ -1000,7 +990,6 @@ 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); @@ -1011,7 +1000,6 @@ 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 41f83e2c..f61944b7 100644 --- a/render/theme.h +++ b/render/theme.h @@ -131,7 +131,6 @@ 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; @@ -142,7 +141,6 @@ 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; |