diff options
| author | Dana Jansens <danakj@orodu.net> | 2007-04-22 00:36:54 +0000 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2007-04-22 00:36:54 +0000 |
| commit | 957963e272be1fba1e06dd2bdcfa9a4348121baf (patch) | |
| tree | 03b239699cc3472652ecf63605ff4df88b80f588 /openbox/client_menu.c | |
| parent | 854b2ae68498133f3119ec614b725025af3fd66b (diff) | |
1) get rid of menu titles
2) let separators have labels, when they have a label, then they will appear like a menu title used to
so if you want a menu title, you use a separator in the menu itself at the top
more style work may be needed
Diffstat (limited to 'openbox/client_menu.c')
| -rw-r--r-- | openbox/client_menu.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/openbox/client_menu.c b/openbox/client_menu.c index 7f188456..f3e80b99 100644 --- a/openbox/client_menu.c +++ b/openbox/client_menu.c @@ -57,8 +57,6 @@ static void client_update(ObMenuFrame *frame, gpointer data) ObMenuEntry *e; GList *it; - frame->show_title = FALSE; - for (it = menu->entries; it; it = g_list_next(it)) { e = it->data; if (e->type == OB_MENU_ENTRY_TYPE_NORMAL) @@ -140,7 +138,7 @@ static void send_to_update(ObMenuFrame *frame, gpointer data) guint desk; if (i >= screen_num_desktops) { - menu_add_separator(menu, -1); + menu_add_separator(menu, -1, NULL); desk = DESKTOP_ALL; name = _("All desktops"); @@ -192,11 +190,7 @@ void client_menu_startup() menu = menu_new(CLIENT_MENU_NAME, _("Client menu"), NULL); menu_set_update_func(menu, client_update); - e = menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME); - e->data.normal.mask = ob_rr_theme->desk_mask; - e->data.normal.mask_normal_color = ob_rr_theme->menu_color; - e->data.normal.mask_disabled_color = ob_rr_theme->menu_disabled_color; - e->data.normal.mask_selected_color = ob_rr_theme->menu_selected_color; + menu_add_submenu(menu, CLIENT_SEND_TO, SEND_TO_MENU_NAME); menu_add_submenu(menu, CLIENT_LAYER, LAYER_MENU_NAME); @@ -238,7 +232,7 @@ void client_menu_startup() OB_USER_ACTION_MENU_SELECTION)); menu_add_normal(menu, CLIENT_DECORATE, _("Decorate"), acts); - menu_add_separator(menu, -1); + menu_add_separator(menu, -1, NULL); acts = g_slist_prepend(NULL, action_from_string ("Move", OB_USER_ACTION_MENU_SELECTION)); @@ -248,7 +242,7 @@ void client_menu_startup() ("Resize", OB_USER_ACTION_MENU_SELECTION)); menu_add_normal(menu, CLIENT_RESIZE, _("Resize"), acts); - menu_add_separator(menu, -1); + menu_add_separator(menu, -1, NULL); acts = g_slist_prepend(NULL, action_from_string ("Close", OB_USER_ACTION_MENU_SELECTION)); |