From 9116b124daa4ddff07918ab4d0e871f6d086cd09 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Tue, 2 Aug 2011 22:17:11 +0200 Subject: Revert these two commits temporarily to make the buttons merge easier 1e427a3358deeadf8abc326e714ee201fddc43d6 2288da0ae3b44c987687e3deeb7864fcb7b23bb9 --- obrender/theme.c | 111 ------------------------------------------------------- obrender/theme.h | 8 ---- 2 files changed, 119 deletions(-) (limited to 'obrender') diff --git a/obrender/theme.c b/obrender/theme.c index 9cc41573..dfd79985 100644 --- a/obrender/theme.c +++ b/obrender/theme.c @@ -147,9 +147,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_hilite_bg = RrAppearanceNew(inst, 0); theme->osd_unhilite_label = RrAppearanceNew(inst, 1); theme->osd_unhilite_bg = RrAppearanceNew(inst, 0); - theme->osd_unpressed_button = RrAppearanceNew(inst, 1); - theme->osd_pressed_button = RrAppearanceNew(inst, 5); - theme->osd_focused_button = RrAppearanceNew(inst, 5); /* load the font stuff */ theme->win_font_focused = get_font(active_window_font, @@ -440,41 +437,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->menu_color->r, theme->menu_color->g, theme->menu_color->b); - if (!read_color(db, inst, "osd.button.unpressed.text.color", - &theme->osd_unpressed_color)) - theme->osd_unpressed_color = - RrColorNew(inst, - theme->osd_text_active_color->r, - theme->osd_text_active_color->g, - theme->osd_text_active_color->b); - if (!read_color(db, inst, "osd.button.pressed.text.color", - &theme->osd_pressed_color)) - theme->osd_pressed_color = - RrColorNew(inst, - theme->osd_text_active_color->r, - theme->osd_text_active_color->g, - theme->osd_text_active_color->b); - if (!read_color(db, inst, "osd.button.focused.text.color", - &theme->osd_focused_color)) - theme->osd_focused_color = - RrColorNew(inst, - theme->osd_text_active_color->r, - theme->osd_text_active_color->g, - theme->osd_text_active_color->b); - if (!read_color(db, inst, "osd.button.pressed.box.color", - &theme->osd_pressed_lineart)) - theme->osd_pressed_lineart = - RrColorNew(inst, - theme->titlebut_focused_pressed_color->r, - theme->titlebut_focused_pressed_color->g, - theme->titlebut_focused_pressed_color->b); - if (!read_color(db, inst, "osd.button.focused.box.color", - &theme->osd_focused_lineart)) - theme->osd_focused_lineart = - RrColorNew(inst, - theme->titlebut_hover_focused_color->r, - theme->titlebut_hover_focused_color->g, - theme->titlebut_hover_focused_color->b); /* load the image masks */ @@ -822,37 +784,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->a_hover_unfocused_max = RrAppearanceCopy(theme->a_unfocused_unpressed_max); } - if (!read_appearance(db, inst, - "osd.button.unpressed.bg", - theme->osd_unpressed_button, - TRUE)) - { - RrAppearanceFree(theme->osd_unpressed_button); - theme->osd_unpressed_button = - RrAppearanceCopy(theme->a_focused_unpressed_max); - } - if (!read_appearance(db, inst, - "osd.button.pressed.bg", - theme->osd_pressed_button, - TRUE)) - { - RrAppearanceFree(theme->osd_pressed_button); - theme->osd_pressed_button = - RrAppearanceCopy(theme->a_focused_pressed_max); - RrAppearanceRemoveTextures(theme->osd_pressed_button); - RrAppearanceAddTextures(theme->osd_pressed_button, 5); - } - if (!read_appearance(db, inst, - "osd.button.focused.bg", - theme->osd_focused_button, - TRUE)) - { - RrAppearanceFree(theme->osd_focused_button); - theme->osd_focused_button = - RrAppearanceCopy(theme->a_hover_focused_max); - RrAppearanceRemoveTextures(theme->osd_focused_button); - RrAppearanceAddTextures(theme->osd_focused_button, 5); - } theme->a_disabled_focused_close = RrAppearanceCopy(theme->a_disabled_focused_max); @@ -1050,40 +981,6 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->osd_hilite_label->texture[0].data.text.shadow_alpha = theme->osd_text_active_shadow_alpha; - theme->osd_unpressed_button->texture[0].type = - theme->osd_pressed_button->texture[0].type = - theme->osd_focused_button->texture[0].type = - RR_TEXTURE_TEXT; - - theme->osd_unpressed_button->texture[0].data.text.justify = - theme->osd_pressed_button->texture[0].data.text.justify = - theme->osd_focused_button->texture[0].data.text.justify = - RR_JUSTIFY_CENTER; - - theme->osd_unpressed_button->texture[0].data.text.font = - theme->osd_pressed_button->texture[0].data.text.font = - theme->osd_focused_button->texture[0].data.text.font = - theme->osd_font_hilite; - - theme->osd_unpressed_button->texture[0].data.text.color = - theme->osd_unpressed_color; - theme->osd_pressed_button->texture[0].data.text.color = - theme->osd_pressed_color; - theme->osd_focused_button->texture[0].data.text.color = - theme->osd_focused_color; - - theme->osd_pressed_button->texture[1].data.lineart.color = - theme->osd_pressed_button->texture[2].data.lineart.color = - theme->osd_pressed_button->texture[3].data.lineart.color = - theme->osd_pressed_button->texture[4].data.lineart.color = - theme->osd_pressed_lineart; - - theme->osd_focused_button->texture[1].data.lineart.color = - theme->osd_focused_button->texture[2].data.lineart.color = - theme->osd_focused_button->texture[3].data.lineart.color = - theme->osd_focused_button->texture[4].data.lineart.color = - theme->osd_focused_lineart; - theme->a_unfocused_label->texture[0].type = RR_TEXTURE_TEXT; theme->a_unfocused_label->texture[0].data.text.justify = winjust; theme->a_unfocused_label->texture[0].data.text.font = @@ -1625,11 +1522,6 @@ void RrThemeFree(RrTheme *theme) RrColorFree(theme->osd_text_inactive_color); RrColorFree(theme->osd_text_active_shadow_color); RrColorFree(theme->osd_text_inactive_shadow_color); - RrColorFree(theme->osd_pressed_color); - RrColorFree(theme->osd_unpressed_color); - RrColorFree(theme->osd_focused_color); - RrColorFree(theme->osd_pressed_lineart); - RrColorFree(theme->osd_focused_lineart); RrColorFree(theme->menu_title_shadow_color); RrColorFree(theme->menu_text_normal_shadow_color); RrColorFree(theme->menu_text_selected_shadow_color); @@ -1765,9 +1657,6 @@ void RrThemeFree(RrTheme *theme) RrAppearanceFree(theme->osd_hilite_label); RrAppearanceFree(theme->osd_unhilite_bg); RrAppearanceFree(theme->osd_unhilite_label); - RrAppearanceFree(theme->osd_pressed_button); - RrAppearanceFree(theme->osd_unpressed_button); - RrAppearanceFree(theme->osd_focused_button); g_slice_free(RrTheme, theme); } diff --git a/obrender/theme.h b/obrender/theme.h index 2ffc6375..3f9063e6 100644 --- a/obrender/theme.h +++ b/obrender/theme.h @@ -103,11 +103,6 @@ struct _RrTheme { RrColor *osd_text_inactive_shadow_color; gchar osd_text_active_shadow_alpha; gchar osd_text_inactive_shadow_alpha; - RrColor *osd_pressed_color; - RrColor *osd_unpressed_color; - RrColor *osd_focused_color; - RrColor *osd_pressed_lineart; - RrColor *osd_focused_lineart; RrColor *menu_title_shadow_color; gchar menu_title_shadow_alpha; RrColor *menu_text_normal_shadow_color; @@ -253,9 +248,6 @@ struct _RrTheme { RrAppearance *osd_hilite_label; /* can be parent relative */ RrAppearance *osd_unhilite_bg; /* can never be parent relative */ RrAppearance *osd_unhilite_label; /* can be parent relative */ - RrAppearance *osd_pressed_button; - RrAppearance *osd_unpressed_button; - RrAppearance *osd_focused_button; gchar *name; }; -- cgit v1.2.3