READ_INT("border.width", theme->fbwidth, 0, 100, 1);
READ_INT("menu.border.width", theme->mbwidth, 0, 100, theme->fbwidth);
READ_INT("osd.border.width", theme->obwidth, 0, 100, theme->fbwidth);
+ READ_INT("undecorated.border.width", theme->ubwidth, 0, 100,
+ theme->fbwidth);
READ_INT("menu.separator.width", theme->menu_sep_width, 1, 100, 1);
- READ_INT("menu.separator.padding.width", theme->menu_sep_paddingx, 0, 100, 6);
- READ_INT("menu.separator.padding.height", theme->menu_sep_paddingy, 0, 100, 3);
+ READ_INT("menu.separator.padding.width", theme->menu_sep_paddingx,
+ 0, 100, 6);
+ READ_INT("menu.separator.padding.height", theme->menu_sep_paddingy,
+ 0, 100, 3);
READ_INT("window.client.padding.width", theme->cbwidthx, 0, 100,
theme->paddingx);
READ_INT("window.client.padding.height", theme->cbwidthy, 0, 100,
/* load colors */
READ_COLOR_("window.active.border.color", "border.color",
theme->frame_focused_border_color, RrColorNew(inst, 0, 0, 0));
-
+ /* undecorated focused border color inherits from frame focused border
+ color */
+ READ_COLOR("window.undecorated.active.border.color",
+ theme->frame_undecorated_focused_border_color,
+ RrColorCopy(theme->frame_focused_border_color));
/* title separator focused color inherits from focused border color */
READ_COLOR("window.active.title.separator.color",
theme->title_separator_focused_color,
theme->frame_unfocused_border_color,
RrColorCopy(theme->frame_focused_border_color));
+ /* undecorated unfocused border color inherits from frame unfocused border
+ color */
+ READ_COLOR("window.undecorated.inactive.border.color",
+ theme->frame_undecorated_unfocused_border_color,
+ RrColorCopy(theme->frame_unfocused_border_color));
+
/* title separator unfocused color inherits from unfocused border color */
READ_COLOR("window.inactive.title.separator.color",
theme->title_separator_unfocused_color,
READ_COLOR("window.active.label.text.color", theme->title_focused_color,
RrColorNew(inst, 0x0, 0x0, 0x0));
+ READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color,
+ RrColorCopy(theme->title_unfocused_color));
+
READ_COLOR_("osd.active.label.text.color",
"osd.label.text.color",
theme->osd_text_active_color, RrColorCopy(theme->title_focused_color));
- READ_COLOR("window.inactive.label.text.color", theme->title_unfocused_color,
- RrColorCopy(theme->title_unfocused_color));
-
READ_COLOR("osd.inactive.label.text.color", theme->osd_text_inactive_color,
RrColorNew(inst, 0xff, 0xff, 0xff));
- READ_COLOR("window.inactive.label.text.color",
- theme->title_unfocused_color,
- RrColorNew(inst, 0xff, 0xff, 0xff));
-
READ_COLOR("window.active.button.unpressed.image.color",
theme->titlebut_focused_unpressed_color,
RrColorNew(inst, 0, 0, 0));
theme->a_focused_label->texture[0].data.text.shadow_offset_y;
if (theme->title_focused_shadow_color)
theme->osd_text_active_shadow_color =
- RrColorNew(inst,
- theme->title_focused_shadow_color->r,
- theme->title_focused_shadow_color->g,
- theme->title_focused_shadow_color->b);
+ RrColorCopy(theme->title_focused_shadow_color);
else
theme->osd_text_active_shadow_color = RrColorNew(inst, 0, 0, 0);
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.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->a_unfocused_label->texture[0].data.text.shadow_offset_y;
if (theme->title_unfocused_shadow_color)
theme->osd_text_inactive_shadow_color =
- RrColorNew(inst,
- theme->title_unfocused_shadow_color->r,
- theme->title_unfocused_shadow_color->g,
- theme->title_unfocused_shadow_color->b);
+ RrColorCopy(theme->title_unfocused_shadow_color);
else
theme->osd_text_inactive_shadow_color = RrColorNew(inst, 0, 0, 0);
theme->osd_text_inactive_shadow_alpha =