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_list_combined_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_list_combined_menu.c')
| -rw-r--r-- | openbox/client_list_combined_menu.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c index 39a8e60b..3c6d8c6c 100644 --- a/openbox/client_list_combined_menu.c +++ b/openbox/client_list_combined_menu.c @@ -48,13 +48,7 @@ static void self_update(ObMenuFrame *frame, gpointer data) gboolean empty = TRUE; /* Don't need a separator at the very top */ - if (desktop > 0) - menu_add_separator(menu, -1); - e = menu_add_normal(menu, -1, NULL, NULL); - e->data.normal.enabled = FALSE; - e->data.normal.label = g_strdup(screen_desktop_names[desktop]); - /* The one at the bottom will always have entries below it though */ - menu_add_separator(menu, -1); + menu_add_separator(menu, -1, screen_desktop_names[desktop]); for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) { ObClient *c = it->data; if (client_normal(c) && (!c->skip_taskbar || c->iconic) && @@ -66,11 +60,6 @@ static void self_update(ObMenuFrame *frame, gpointer data) empty = FALSE; - if (!icons && c->iconic) { - icons = TRUE; - menu_add_separator(menu, -1); - } - act = action_from_string("Activate", OB_USER_ACTION_MENU_SELECTION); act->data.activate.any.c = c; @@ -79,8 +68,13 @@ static void self_update(ObMenuFrame *frame, gpointer data) OB_USER_ACTION_MENU_SELECTION); act->data.desktop.desk = desktop; acts = g_slist_append(acts, act); - e = menu_add_normal(menu, i, (c->iconic ? - c->icon_title : c->title), acts); + + if (c->iconic) { + gchar *title = g_strdup_printf("(%s)", c->icon_title); + e = menu_add_normal(menu, i, title, acts); + g_free(title); + } else + e = menu_add_normal(menu, i, c->title, acts); if (config_menu_client_list_icons && (icon = client_icon(c, 32, 32))) { |