remove the title separator width thing. add a separate color for the title separator
Dana Jansens danakj@orodu.net
4 files changed,
26 insertions(+),
10 deletions(-)
M
openbox/frame.c
→
openbox/frame.c
@@ -365,7 +365,7 @@ self->cbwidth_r + (!self->max_horz ? self->bwidth : 0),
self->cbwidth_b + (!self->max_horz || !self->max_vert ? self->bwidth : 0)); if (self->decorations & OB_FRAME_DECOR_TITLEBAR) - self->size.top += ob_rr_theme->title_height + ob_rr_theme->tswidth; + self->size.top += ob_rr_theme->title_height + self->bwidth; if (self->decorations & OB_FRAME_DECOR_HANDLE && ob_rr_theme->handle_height > 0) {@@ -468,14 +468,12 @@ XMapWindow(ob_display, self->titletop);
XMapWindow(ob_display, self->titletopleft); XMapWindow(ob_display, self->titletopright); - if (self->decorations & OB_FRAME_DECOR_TITLEBAR && - ob_rr_theme->tswidth) - { + if (self->decorations & OB_FRAME_DECOR_TITLEBAR) { XMoveResizeWindow(ob_display, self->titlebottom, self->bwidth, ob_rr_theme->title_height + self->bwidth, self->width, - ob_rr_theme->tswidth); + self->bwidth); XMapWindow(ob_display, self->titlebottom); } else
M
openbox/framerender.c
→
openbox/framerender.c
@@ -71,8 +71,6 @@ XSetWindowBackground(ob_display, self->titletopright, px);
XClearWindow(ob_display, self->titletopright); XSetWindowBackground(ob_display, self->titleright, px); XClearWindow(ob_display, self->titleright); - XSetWindowBackground(ob_display, self->titlebottom, px); - XClearWindow(ob_display, self->titlebottom); XSetWindowBackground(ob_display, self->handleleft, px); XClearWindow(ob_display, self->handleleft);@@ -96,6 +94,13 @@ XSetWindowBackground(ob_display, self->rgriptop, px);
XClearWindow(ob_display, self->rgriptop); XSetWindowBackground(ob_display, self->rgripbottom, px); XClearWindow(ob_display, self->rgripbottom); + + px = (self->focused ? + RrColorPixel(ob_rr_theme->title_separator_focused_color) : + RrColorPixel(ob_rr_theme->title_separator_unfocused_color)); + + XSetWindowBackground(ob_display, self->titlebottom, px); + XClearWindow(ob_display, self->titlebottom); } if (self->decorations & OB_FRAME_DECOR_TITLEBAR) {
M
render/theme.c
→
render/theme.c
@@ -207,7 +207,6 @@
if (!FIND(int, L("dimensions","window","border"), &theme->fbwidth, 0, 100)) theme->fbwidth = 1; - theme->tswidth = theme->fbwidth; /* menu border width inherits from frame border width */ if (!FIND(int, L("dimensions","menu","border"),@@ -222,6 +221,13 @@ /* load colors */
if (!FIND(color, L("window","active","border"), &theme->frame_focused_border_color, NULL)) theme->frame_focused_border_color = RrColorNew(inst, 0, 0, 0); + /* title separator focused color inherits from focused boder color */ + if (!FIND(color, L("window","active","titleseparator"), + &theme->title_separator_focused_color, NULL)) + theme->title_separator_focused_color = + RrColorNew(inst, theme->frame_focused_border_color->r, + theme->frame_focused_border_color->g, + theme->frame_focused_border_color->b); /* frame unfocused border color inherits from frame focused border color */ if (!FIND(color, L("window","inactive","border"), &theme->frame_unfocused_border_color, NULL))@@ -230,6 +236,13 @@ RrColorNew(inst,
theme->frame_focused_border_color->r, theme->frame_focused_border_color->g, theme->frame_focused_border_color->b); + /* title separator unfocused color inherits from unfocused boder color */ + if (!FIND(color, L("window","inactive","titleseparator"), + &theme->title_separator_unfocused_color, NULL)) + theme->title_separator_unfocused_color = + RrColorNew(inst, theme->frame_unfocused_border_color->r, + theme->frame_unfocused_border_color->g, + theme->frame_unfocused_border_color->b); /* menu border color inherits from frame focused border color */ if (!FIND(color, L("menu","border"),
M
render/theme.h
→
render/theme.h
@@ -41,8 +41,6 @@ gint paddingx;
gint paddingy; gint handle_height; gint fbwidth; /*!< frame border width */ - gint tswidth; /*!< title separator width - between the titlebar and the - client */ gint mbwidth; /*!< menu border width */ gint cbwidthx; gint cbwidthy;@@ -62,6 +60,8 @@ /* style settings - colors */
RrColor *menu_border_color; RrColor *frame_focused_border_color; RrColor *frame_unfocused_border_color; + RrColor *title_separator_focused_color; + RrColor *title_separator_unfocused_color; RrColor *cb_focused_color; RrColor *cb_unfocused_color; RrColor *title_focused_color;