From 5ebab9c6fa1a5416c53a7d0def0c740836229269 Mon Sep 17 00:00:00 2001 From: Mikael Magnusson Date: Tue, 24 Jul 2007 01:38:43 +0200 Subject: [PATCH] Change the client list menus back to separating iconified windows with a line instead of bracketing them. --- openbox/client_list_combined_menu.c | 9 ++++++--- openbox/client_list_menu.c | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/openbox/client_list_combined_menu.c b/openbox/client_list_combined_menu.c index a04d07d6..464036f7 100644 --- a/openbox/client_list_combined_menu.c +++ b/openbox/client_list_combined_menu.c @@ -49,6 +49,7 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data) for (desktop = 0; desktop < screen_num_desktops; desktop++) { gboolean empty = TRUE; gboolean onlyiconic = TRUE; + gboolean noicons = TRUE; menu_add_separator(menu, SEPARATOR, screen_desktop_names[desktop]); for (it = focus_order; it; it = g_list_next(it)) { @@ -59,9 +60,11 @@ static gboolean self_update(ObMenuFrame *frame, gpointer data) empty = FALSE; if (c->iconic) { - gchar *title = g_strdup_printf("(%s)", c->icon_title); - e = menu_add_normal(menu, desktop, title, NULL, FALSE); - g_free(title); + if (noicons) { + menu_add_separator(menu, -1, NULL); + noicons = FALSE; + } + e = menu_add_normal(menu, desktop, c->icon_title, NULL, FALSE); } else { onlyiconic = FALSE; e = menu_add_normal(menu, desktop, c->title, NULL, FALSE); diff --git a/openbox/client_list_menu.c b/openbox/client_list_menu.c index 4ec6e785..3fdd179b 100644 --- a/openbox/client_list_menu.c +++ b/openbox/client_list_menu.c @@ -49,6 +49,7 @@ static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data) GList *it; gboolean empty = TRUE; gboolean onlyiconic = TRUE; + gboolean noicons = TRUE; menu_clear_entries(menu); @@ -62,9 +63,11 @@ static gboolean desk_menu_update(ObMenuFrame *frame, gpointer data) empty = FALSE; if (c->iconic) { - gchar *title = g_strdup_printf("(%s)", c->icon_title); - e = menu_add_normal(menu, d->desktop, title, NULL, FALSE); - g_free(title); + if (noicons) { + menu_add_separator(menu, -1, NULL); + noicons = FALSE; + } + e = menu_add_normal(menu, d->desktop, c->icon_title, NULL, FALSE); } else { onlyiconic = FALSE; e = menu_add_normal(menu, d->desktop, c->title, NULL, FALSE); -- 2.34.1