DesktopData *d = data;
GList *it;
gint i;
- gboolean icons = FALSE;
gboolean empty = TRUE;
+ gboolean onlyiconic = TRUE;
menu_clear_entries(menu);
empty = FALSE;
- if (!icons && c->iconic) {
- icons = TRUE;
- menu_add_separator(menu, -1, NULL);
- }
-
act = action_from_string("Activate",
OB_USER_ACTION_MENU_SELECTION);
act->data.activate.any.c = c;
OB_USER_ACTION_MENU_SELECTION);
act->data.desktop.desk = d->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, FALSE);
+ g_free(title);
+ } else {
+ onlyiconic = FALSE;
+ e = menu_add_normal(menu, i, c->title, acts, FALSE);
+ }
if (config_menu_client_list_icons
&& (icon = client_icon(c, 32, 32))) {
}
}
- if (empty) {
- /* no entries */
+ if (empty || onlyiconic) {
+ /* no entries or only iconified windows, so add a
+ * way to go to this desktop without uniconifying a window */
+ if (!empty)
+ menu_add_separator(menu, -1, NULL);
GSList *acts = NULL;
ObAction* act;
act = action_from_string("Desktop", OB_USER_ACTION_MENU_SELECTION);
act->data.desktop.desk = d->desktop;
acts = g_slist_append(acts, act);
- e = menu_add_normal(menu, 0, _("Go there..."), acts);
+ e = menu_add_normal(menu, 0, _("Go there..."), acts, TRUE);
if (d->desktop == screen_desktop)
e->data.normal.enabled = FALSE;
}
DesktopData *data = g_new(DesktopData, 1);
data->desktop = i;
- submenu = menu_new(name, screen_desktop_names[i], data);
+ submenu = menu_new(name, screen_desktop_names[i], FALSE, data);
menu_set_update_func(submenu, desk_menu_update);
menu_set_execute_func(submenu, desk_menu_execute);
menu_set_destroy_func(submenu, desk_menu_destroy);
if (!reconfig)
client_add_destructor(client_dest, NULL);
- menu = menu_new(MENU_NAME, _("Desktops"), NULL);
+ menu = menu_new(MENU_NAME, _("Desktops"), TRUE, NULL);
menu_set_update_func(menu, self_update);
}