all repos — openbox @ d162451a0113da1e012e007f848e38f07348d9d2

openbox fork - make it a bit more like ryudo 

Fix some rebase artifacts
Mikael Magnusson mikachu@gmail.com
commit

d162451a0113da1e012e007f848e38f07348d9d2

parent

da5441ecec51be3564c31275d193a2a18f157714

2 files changed, 2 insertions(+), 2 deletions(-)

jump to
M obrender/theme.c → obrender/theme.c 
@@ -295,7 +295,7 @@ RrColorNew(inst, 0x0, 0x0, 0x0));
 
     READ_COLOR_("osd.active.label.text.color",
                 "osd.label.text.color",
-                theme->osd_color, RrColorCopy(theme->title_focused_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));
M openbox/client_menu.c → openbox/client_menu.c 
@@ -408,7 +408,7 @@ e->data.normal.mask = ob_rr_theme->btn_max->mask;
     set_icon_color(e);
 
     e = menu_add_normal(menu, CLIENT_SHADE, _("_Roll up/down"), NULL, TRUE);
-    e->data.normal.mask = ob_rr_theme->shade_mask;
+    e->data.normal.mask = ob_rr_theme->btn_shade->mask;
     set_icon_color(e);
 
     menu_add_normal(menu, CLIENT_DECORATE, _("Un/_Decorate"), NULL, TRUE);