nilix/openbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

also add the go there entry to client list menus if the only windows on a desktop are iconified. hopefully this separator will be okay?

Browse source
This commit is contained in:
Mikael Magnusson 2007-04-27 12:55:59 +00:00
parent fc55347e61
commit e5d6a552a4
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
openbox/client_list_combined_menu.c
View file

@ -45,8 +45,8 @@ static void self_update(ObMenuFrame *frame, gpointer data)
for (desktop = 0; desktop < screen_num_desktops; desktop++) { for (desktop = 0; desktop < screen_num_desktops; desktop++) {
gboolean empty = TRUE; gboolean empty = TRUE;
gboolean onlyiconic = TRUE;
/* Don't need a separator at the very top */
menu_add_separator(menu, -1, screen_desktop_names[desktop]); menu_add_separator(menu, -1, screen_desktop_names[desktop]);
for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) { for (it = focus_order, i = 0; it; it = g_list_next(it), ++i) {
ObClient *c = it->data; ObClient *c = it->data;
@ -72,8 +72,10 @@ static void self_update(ObMenuFrame *frame, gpointer data)
gchar *title = g_strdup_printf("(%s)", c->icon_title); gchar *title = g_strdup_printf("(%s)", c->icon_title);
e = menu_add_normal(menu, i, title, acts, FALSE); e = menu_add_normal(menu, i, title, acts, FALSE);
g_free(title); g_free(title);
} else } else {
onlyiconic = FALSE;
e = menu_add_normal(menu, i, c->title, acts, FALSE); e = menu_add_normal(menu, i, c->title, acts, FALSE);
}
if (config_menu_client_list_icons if (config_menu_client_list_icons
&& (icon = client_icon(c, 32, 32))) { && (icon = client_icon(c, 32, 32))) {
@ -84,8 +86,11 @@ static void self_update(ObMenuFrame *frame, gpointer data)
} }
} }
if (empty) { if (empty || onlyiconic) {
/* no entries */ /* 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; GSList *acts = NULL;
ObAction* act; ObAction* act;

12
openbox/client_list_menu.c
View file

@ -45,6 +45,7 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
GList *it; GList *it;
gint i; gint i;
gboolean empty = TRUE; gboolean empty = TRUE;
gboolean onlyiconic = TRUE;
menu_clear_entries(menu); menu_clear_entries(menu);
@ -73,8 +74,10 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
gchar *title = g_strdup_printf("(%s)", c->icon_title); gchar *title = g_strdup_printf("(%s)", c->icon_title);
e = menu_add_normal(menu, i, title, acts, FALSE); e = menu_add_normal(menu, i, title, acts, FALSE);
g_free(title); g_free(title);
} else } else {
onlyiconic = FALSE;
e = menu_add_normal(menu, i, c->title, acts, FALSE); e = menu_add_normal(menu, i, c->title, acts, FALSE);
}
if (config_menu_client_list_icons if (config_menu_client_list_icons
&& (icon = client_icon(c, 32, 32))) { && (icon = client_icon(c, 32, 32))) {
@ -85,8 +88,11 @@ static void desk_menu_update(ObMenuFrame *frame, gpointer data)
} }
} }
if (empty) { if (empty || onlyiconic) {
/* no entries */ /* 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; GSList *acts = NULL;
ObAction* act; ObAction* act;