From: Mikael Magnusson Date: Wed, 5 Nov 2014 09:52:22 +0000 (+0100) Subject: Remove wrong code from button mask loading code, bug 6065 X-Git-Tag: release-3.6.0~16 X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=f1f5610cca8511be3bd03198f49a6a4e9fc15314;p=mikachu%2Fopenbox.git Remove wrong code from button mask loading code, bug 6065 The READ_MASK_COPY macro already uses these exact fallbacks, so these lines just overwrote the custom bitmaps with the default fallback bitmaps. --- diff --git a/obrender/theme.c b/obrender/theme.c index 87ca5c89..4ac4c5b9 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -550,21 +550,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->def_win_icon_w = OB_DEFAULT_ICON_WIDTH; theme->def_win_icon_h = OB_DEFAULT_ICON_HEIGHT; - /* the toggled hover mask = the toggled unpressed mask (i.e. no change) */ - theme->btn_max->toggled_hover_mask = - RrPixmapMaskCopy(theme->btn_max->toggled_mask); - theme->btn_desk->toggled_hover_mask = - RrPixmapMaskCopy(theme->btn_desk->toggled_mask); - theme->btn_shade->toggled_hover_mask = - RrPixmapMaskCopy(theme->btn_shade->toggled_mask); - /* the toggled pressed mask = the toggled unpressed mask (i.e. no change)*/ - theme->btn_max->toggled_pressed_mask = - RrPixmapMaskCopy(theme->btn_max->toggled_mask); - theme->btn_desk->toggled_pressed_mask = - RrPixmapMaskCopy(theme->btn_desk->toggled_mask); - theme->btn_shade->toggled_pressed_mask = - RrPixmapMaskCopy(theme->btn_shade->toggled_mask); - /* read the decoration textures */ READ_APPEARANCE("window.active.title.bg", theme->a_focused_title, FALSE); READ_APPEARANCE("window.inactive.title.bg", theme->a_unfocused_title,