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

Use a_unfocused_label for all but the hilited items.

Browse source 
Should introduce some sort of theme element for this I suppose, but dana is not here.
This commit is contained in:
Mikael Magnusson 2007-09-03 00:42:14 +02:00 committed by Dana Jansens
parent 3592046b2b
commit 2924adb9b1
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
openbox/focus_cycle_popup.c
View file

@ -63,6 +63,7 @@ struct _ObFocusCyclePopup
RrAppearance *a_bg; RrAppearance *a_bg;
RrAppearance *a_text; RrAppearance *a_text;
RrAppearance *a_hilite_text;
RrAppearance *a_icon; RrAppearance *a_icon;
gboolean mapped; gboolean mapped;
@ -100,9 +101,11 @@ void focus_cycle_popup_startup(gboolean reconfig)
popup.obwin.type = OB_WINDOW_CLASS_INTERNAL; popup.obwin.type = OB_WINDOW_CLASS_INTERNAL;
popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg); popup.a_bg = RrAppearanceCopy(ob_rr_theme->osd_hilite_bg);
popup.a_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label); popup.a_hilite_text = RrAppearanceCopy(ob_rr_theme->osd_hilite_label);
popup.a_text = RrAppearanceCopy(ob_rr_theme->a_unfocused_label);
popup.a_icon = RrAppearanceCopy(ob_rr_theme->a_clear); popup.a_icon = RrAppearanceCopy(ob_rr_theme->a_clear);
popup.a_hilite_text->surface.parent = popup.a_bg;
popup.a_text->surface.parent = popup.a_bg; popup.a_text->surface.parent = popup.a_bg;
popup.a_icon->surface.parent = popup.a_bg; popup.a_icon->surface.parent = popup.a_bg;
@ -181,6 +184,7 @@ void focus_cycle_popup_shutdown(gboolean reconfig)
XDestroyWindow(obt_display, popup.bg); XDestroyWindow(obt_display, popup.bg);
RrAppearanceFree(popup.a_icon); RrAppearanceFree(popup.a_icon);
RrAppearanceFree(popup.a_hilite_text);
RrAppearanceFree(popup.a_text); RrAppearanceFree(popup.a_text);
RrAppearanceFree(popup.a_bg); RrAppearanceFree(popup.a_bg);
} }
@ -348,6 +352,7 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
const ObClientIcon *icon; const ObClientIcon *icon;
gint innerx, innery, textx, texty; gint innerx, innery, textx, texty;
gint textw /* texth = ICON_SIZE */; gint textw /* texth = ICON_SIZE */;
RrAppearance *text;
/* find the dimensions of the icon inside it */ /* find the dimensions of the icon inside it */
innerx = l; innerx = l;
@ -391,10 +396,11 @@ static void popup_render(ObFocusCyclePopup *p, const ObClient *c)
RrPaint(p->a_icon, target->iconwin, HILITE_SIZE, HILITE_SIZE); RrPaint(p->a_icon, target->iconwin, HILITE_SIZE, HILITE_SIZE);
/* draw the text */ /* draw the text */
p->a_text->texture[0].data.text.string = target->text; text = (target == newtarget) ? p->a_hilite_text : p->a_text;
p->a_text->surface.parentx = textx; text->texture[0].data.text.string = target->text;
p->a_text->surface.parenty = texty; text->surface.parentx = textx;
RrPaint(p->a_text, target->textwin, textw, ICON_SIZE); text->surface.parenty = texty;
RrPaint(text, target->textwin, textw, ICON_SIZE);
} }
} }