diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/theme.c | 18 | ||||
| -rw-r--r-- | render/theme.h | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/render/theme.c b/render/theme.c index 15b7e3c9..4aef833f 100644 --- a/render/theme.c +++ b/render/theme.c @@ -213,10 +213,13 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->fbwidth = 1; /* menu border width inherits from frame border width */ - if (!FIND(int, L("dimensions","menu","border"), - &theme->mbwidth, 0, 100)) + if (!FIND(int, L("dimensions","menu","border"), &theme->mbwidth, 0, 100)) theme->mbwidth = theme->fbwidth; + /* osd border width inherits from frame border width */ + if (!FIND(int, L("dimensions","osd","border"), &theme->obwidth, 0, 100)) + theme->obwidth = theme->fbwidth; + if (!FIND(point, L("dimensions","window","clientpadding"), &theme->cbwidthx, &theme->cbwidthy, 0, 100, 0, 100)) theme->cbwidthx = theme->cbwidthy = 1; @@ -251,13 +254,19 @@ RrTheme* RrThemeNew(const RrInstance *inst, const gchar *name, theme->frame_unfocused_border_color->b); /* menu border color inherits from frame focused border color */ - if (!FIND(color, L("menu","border"), - &theme->menu_border_color, NULL)) + if (!FIND(color, L("menu","border"), &theme->menu_border_color, NULL)) theme->menu_border_color = RrColorNew(inst, theme->frame_focused_border_color->r, theme->frame_focused_border_color->g, theme->frame_focused_border_color->b); + /* osd border color inherits from frame focused border color */ + if (!FIND(color, L("osd","border"), &theme->osd_border_color, NULL)) + theme->osd_border_color = + RrColorNew(inst, + theme->frame_focused_border_color->r, + theme->frame_focused_border_color->g, + theme->frame_focused_border_color->b); if (!FIND(color, L("window","active","clientpadding"), &theme->cb_focused_color, NULL)) theme->cb_focused_color = RrColorNew(inst, 255, 255, 255); @@ -1238,6 +1247,7 @@ void RrThemeFree(RrTheme *theme) g_free(theme->name); RrColorFree(theme->menu_border_color); + RrColorFree(theme->osd_border_color); RrColorFree(theme->frame_focused_border_color); RrColorFree(theme->frame_unfocused_border_color); RrColorFree(theme->title_separator_focused_color); diff --git a/render/theme.h b/render/theme.h index e02a69e2..2c35284f 100644 --- a/render/theme.h +++ b/render/theme.h @@ -42,6 +42,7 @@ struct _RrTheme { gint handle_height; gint fbwidth; /*!< frame border width */ gint mbwidth; /*!< menu border width */ + gint obwidth; /*!< osd border width */ gint cbwidthx; gint cbwidthy; gint menu_overlap; @@ -58,6 +59,7 @@ struct _RrTheme { /* style settings - colors */ RrColor *menu_border_color; + RrColor *osd_border_color; RrColor *frame_focused_border_color; RrColor *frame_unfocused_border_color; RrColor *title_separator_focused_color; |