projects
/
mikachu
/
openbox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
177a034
)
be a bit more explicit about what is being copied from one texture to another
author
Dana Jansens
<danakj@orodu.net>
Tue, 25 Jan 2011 17:02:42 +0000
(12:02 -0500)
committer
Mikael Magnusson
<mikachu@gmail.com>
Tue, 2 Aug 2011 20:18:34 +0000
(22:18 +0200)
obrender/theme.c
patch
|
blob
|
history
diff --git
a/obrender/theme.c
b/obrender/theme.c
index
ea49abe
..
85cdf4a
100644
(file)
--- a/
obrender/theme.c
+++ b/
obrender/theme.c
@@
-1001,16
+1001,21
@@
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_hilite_label->texture[0].data.text.shadow_alpha =
theme->osd_text_active_shadow_alpha;
- theme->osd_unpressed_button->texture[0] =
- theme->osd_pressed_button->texture[0] =
- theme->osd_focused_button->texture[0] =
-
theme->osd_hilite_label->texture[0]
;
+ 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.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_unpressed_button->texture[0].data.text.color =
theme->osd_unpressed_color;
theme->osd_pressed_button->texture[0].data.text.color =