From 8058df3f7ce153e31cfebaa696a7e892999acb2b Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Wed, 12 Dec 2007 18:02:38 -0500 Subject: Buttons seem to work! --- openbox/client_menu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'openbox/client_menu.c') diff --git a/openbox/client_menu.c b/openbox/client_menu.c index fd2549cf..cf41ded7 100644 --- a/openbox/client_menu.c +++ b/openbox/client_menu.c @@ -400,11 +400,11 @@ void client_menu_startup(void) menu_add_normal(menu, CLIENT_RESIZE, _("Resi_ze"), NULL, TRUE); e = menu_add_normal(menu, CLIENT_ICONIFY, _("Ico_nify"), NULL, TRUE); - e->data.normal.mask = ob_rr_theme->iconify_mask; + e->data.normal.mask = ob_rr_theme->btn_iconify->mask; set_icon_color(e); e = menu_add_normal(menu, CLIENT_MAXIMIZE, _("Ma_ximize"), NULL, TRUE); - e->data.normal.mask = ob_rr_theme->max_mask; + 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); @@ -416,6 +416,6 @@ void client_menu_startup(void) menu_add_separator(menu, -1, NULL); e = menu_add_normal(menu, CLIENT_CLOSE, _("_Close"), NULL, TRUE); - e->data.normal.mask = ob_rr_theme->close_mask; + e->data.normal.mask = ob_rr_theme->btn_close->mask; set_icon_color(e); } -- cgit v1.2.3 From 95ed8437020ca3070d7cafcdfef78f8b3985fb5f Mon Sep 17 00:00:00 2001 From: Dave Foster Date: Tue, 12 Oct 2010 23:59:51 -0400 Subject: cleaning up remnants of bad rebase merges and modernizing some sections --- openbox/client_menu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'openbox/client_menu.c') diff --git a/openbox/client_menu.c b/openbox/client_menu.c index cf41ded7..ed62a323 100644 --- a/openbox/client_menu.c +++ b/openbox/client_menu.c @@ -276,7 +276,7 @@ static gboolean send_to_menu_update(ObMenuFrame *frame, gpointer data) if ((desk == DESKTOP_ALL && c->desktop != DESKTOP_ALL) || (c->desktop == DESKTOP_ALL && desk == screen_desktop)) { - e->data.normal.mask = ob_rr_theme->desk_mask; + e->data.normal.mask = ob_rr_theme->btn_desk->mask; set_icon_color(e); } else e->data.normal.mask = NULL; @@ -392,7 +392,7 @@ void client_menu_startup(void) menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME); e = menu_add_normal(menu, CLIENT_RESTORE, _("R_estore"), NULL, TRUE); - e->data.normal.mask = ob_rr_theme->max_toggled_mask; + e->data.normal.mask = ob_rr_theme->btn_max->toggled_mask; set_icon_color(e); menu_add_normal(menu, CLIENT_MOVE, _("_Move"), NULL, TRUE); -- cgit v1.2.3 From d162451a0113da1e012e007f848e38f07348d9d2 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Thu, 14 Oct 2010 16:05:15 +0200 Subject: Fix some rebase artifacts --- openbox/client_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'openbox/client_menu.c') diff --git a/openbox/client_menu.c b/openbox/client_menu.c index ed62a323..c6cdd635 100644 --- a/openbox/client_menu.c +++ b/openbox/client_menu.c @@ -408,7 +408,7 @@ void client_menu_startup(void) 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); -- cgit v1.2.3