nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rename back the app_selected appearances to app_hilite

Browse source
This commit is contained in:
Dana Jansens 2003-09-01 16:37:21 +00:00
parent bdfb4e3535
commit 06252b3076
4 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
openbox/menuframe.c
View file

@ -323,7 +323,7 @@ static void menu_entry_frame_render(ObMenuEntryFrame *self)
self->a_bullet->surface.parent = item_a; self->a_bullet->surface.parent = item_a;
self->a_bullet->surface.parentx = self->a_bullet->surface.parentx =
self->frame->text_x + self->frame->text_w - self->frame->item_h self->frame->text_x + self->frame->text_w - self->frame->item_h
- PADDING; + PADDING;
self->a_bullet->surface.parenty = PADDING; self->a_bullet->surface.parenty = PADDING;
RrPaint(self->a_bullet, self->bullet, RrPaint(self->a_bullet, self->bullet,
self->frame->item_h - 2*PADDING, self->frame->item_h - 2*PADDING,

8
openbox/popup.c
View file

@ -97,7 +97,7 @@ void popup_size_to_string(Popup *self, gchar *text)
gint iconw; gint iconw;
if (!self->a_text) if (!self->a_text)
self->a_text = RrAppearanceCopy(ob_rr_theme->app_selected_label); self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
self->a_text->texture[0].data.text.string = text; self->a_text->texture[0].data.text.string = text;
RrMinsize(self->a_text, &textw, &texth); RrMinsize(self->a_text, &textw, &texth);
@ -112,7 +112,7 @@ void popup_size_to_string(Popup *self, gchar *text)
void popup_set_text_align(Popup *self, RrJustify align) void popup_set_text_align(Popup *self, RrJustify align)
{ {
if (!self->a_text) if (!self->a_text)
self->a_text = RrAppearanceCopy(ob_rr_theme->app_selected_label); self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
self->a_text->texture[0].data.text.justify = align; self->a_text->texture[0].data.text.justify = align;
} }
@ -125,11 +125,11 @@ void popup_show(Popup *self, gchar *text, ObClientIcon *icon)
/* create the shit if needed */ /* create the shit if needed */
if (!self->a_bg) if (!self->a_bg)
self->a_bg = RrAppearanceCopy(ob_rr_theme->app_selected_bg); self->a_bg = RrAppearanceCopy(ob_rr_theme->app_hilite_bg);
if (self->hasicon && !self->a_icon) if (self->hasicon && !self->a_icon)
self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex); self->a_icon = RrAppearanceCopy(ob_rr_theme->a_clear_tex);
if (!self->a_text) if (!self->a_text)
self->a_text = RrAppearanceCopy(ob_rr_theme->app_selected_label); self->a_text = RrAppearanceCopy(ob_rr_theme->app_hilite_label);
XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->bwidth); XSetWindowBorderWidth(ob_display, self->bg, ob_rr_theme->bwidth);
XSetWindowBorder(ob_display, self->bg, ob_rr_theme->b_color->pixel); XSetWindowBorder(ob_display, self->bg, ob_rr_theme->b_color->pixel);

48
render/theme.c
View file

@ -68,10 +68,10 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
theme->a_clear = RrAppearanceNew(inst, 0); theme->a_clear = RrAppearanceNew(inst, 0);
theme->a_clear_tex = RrAppearanceNew(inst, 1); theme->a_clear_tex = RrAppearanceNew(inst, 1);
theme->app_selected_bg = RrAppearanceNew(inst, 0); theme->app_hilite_bg = RrAppearanceNew(inst, 0);
theme->app_unselected_bg = RrAppearanceNew(inst, 0); theme->app_unhilite_bg = RrAppearanceNew(inst, 0);
theme->app_selected_label = RrAppearanceNew(inst, 1); theme->app_hilite_label = RrAppearanceNew(inst, 1);
theme->app_unselected_label = RrAppearanceNew(inst, 1); theme->app_unhilite_label = RrAppearanceNew(inst, 1);
if (name) { if (name) {
db = loaddb(theme, name); db = loaddb(theme, name);
@ -464,21 +464,21 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
/* read the appearances for rendering non-decorations */ /* read the appearances for rendering non-decorations */
if (!read_appearance(db, inst, if (!read_appearance(db, inst,
"window.title.focus", theme->app_selected_bg, "window.title.focus", theme->app_hilite_bg,
FALSE)) FALSE))
set_default_appearance(theme->app_selected_bg); set_default_appearance(theme->app_hilite_bg);
if (!read_appearance(db, inst, if (!read_appearance(db, inst,
"window.label.focus", theme->app_selected_label, "window.label.focus", theme->app_hilite_label,
TRUE)) TRUE))
set_default_appearance(theme->app_selected_label); set_default_appearance(theme->app_hilite_label);
if (!read_appearance(db, inst, if (!read_appearance(db, inst,
"window.title.unfocus", theme->app_unselected_bg, "window.title.unfocus", theme->app_unhilite_bg,
FALSE)) FALSE))
set_default_appearance(theme->app_unselected_bg); set_default_appearance(theme->app_unhilite_bg);
if (!read_appearance(db, inst, if (!read_appearance(db, inst,
"window.label.unfocus", theme->app_unselected_label, "window.label.unfocus", theme->app_unhilite_label,
TRUE)) TRUE))
set_default_appearance(theme->app_unselected_label); set_default_appearance(theme->app_unhilite_label);
/* read buttons textures */ /* read buttons textures */
if (!read_appearance(db, inst, if (!read_appearance(db, inst,
@ -633,26 +633,26 @@ RrTheme* RrThemeNew(const RrInstance *inst, gchar *name)
/* set up the textures */ /* set up the textures */
theme->a_focused_label->texture[0].type = theme->a_focused_label->texture[0].type =
theme->app_selected_label->texture[0].type = RR_TEXTURE_TEXT; theme->app_hilite_label->texture[0].type = RR_TEXTURE_TEXT;
theme->a_focused_label->texture[0].data.text.justify = winjust; theme->a_focused_label->texture[0].data.text.justify = winjust;
theme->app_selected_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT; theme->app_hilite_label->texture[0].data.text.justify = RR_JUSTIFY_LEFT;
theme->a_focused_label->texture[0].data.text.font = theme->a_focused_label->texture[0].data.text.font =
theme->app_selected_label->texture[0].data.text.font = theme->app_hilite_label->texture[0].data.text.font =
theme->winfont_focused; theme->winfont_focused;
theme->a_focused_label->texture[0].data.text.color = theme->a_focused_label->texture[0].data.text.color =
theme->app_selected_label->texture[0].data.text.color = theme->app_hilite_label->texture[0].data.text.color =
theme->title_focused_color; theme->title_focused_color;
theme->a_unfocused_label->texture[0].type = theme->a_unfocused_label->texture[0].type =
theme->app_unselected_label->texture[0].type = RR_TEXTURE_TEXT; theme->app_unhilite_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.justify = winjust;
theme->app_unselected_label->texture[0].data.text.justify = theme->app_unhilite_label->texture[0].data.text.justify =
RR_JUSTIFY_LEFT; RR_JUSTIFY_LEFT;
theme->a_unfocused_label->texture[0].data.text.font = theme->a_unfocused_label->texture[0].data.text.font =
theme->app_unselected_label->texture[0].data.text.font = theme->app_unhilite_label->texture[0].data.text.font =
theme->winfont_unfocused; theme->winfont_unfocused;
theme->a_unfocused_label->texture[0].data.text.color = theme->a_unfocused_label->texture[0].data.text.color =
theme->app_unselected_label->texture[0].data.text.color = theme->app_unhilite_label->texture[0].data.text.color =
theme->title_unfocused_color; theme->title_unfocused_color;
theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT; theme->a_menu_title->texture[0].type = RR_TEXTURE_TEXT;
@ -987,10 +987,10 @@ void RrThemeFree(RrTheme *theme)
RrAppearanceFree(theme->a_menu_text_selected); RrAppearanceFree(theme->a_menu_text_selected);
RrAppearanceFree(theme->a_clear); RrAppearanceFree(theme->a_clear);
RrAppearanceFree(theme->a_clear_tex); RrAppearanceFree(theme->a_clear_tex);
RrAppearanceFree(theme->app_selected_bg); RrAppearanceFree(theme->app_hilite_bg);
RrAppearanceFree(theme->app_unselected_bg); RrAppearanceFree(theme->app_unhilite_bg);
RrAppearanceFree(theme->app_selected_label); RrAppearanceFree(theme->app_hilite_label);
RrAppearanceFree(theme->app_unselected_label); RrAppearanceFree(theme->app_unhilite_label);
} }
} }

8
render/theme.h
View file

@ -153,10 +153,10 @@ struct _RrTheme {
RrAppearance *a_clear; /* clear with no texture */ RrAppearance *a_clear; /* clear with no texture */
RrAppearance *a_clear_tex; /* clear with a texture */ RrAppearance *a_clear_tex; /* clear with a texture */
RrAppearance *app_selected_bg; RrAppearance *app_hilite_bg;
RrAppearance *app_unselected_bg; RrAppearance *app_unhilite_bg;
RrAppearance *app_selected_label; RrAppearance *app_hilite_label;
RrAppearance *app_unselected_label; RrAppearance *app_unhilite_label;
}; };