Hide the desktop cycle popup when the focus cycle popup is shown.

diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c
index e0a8080f7ed16c2d9b118eb0822f816bb2f416b2..1869cc3520deaa177b74b258640091b798f277fd 100644 (file)
--- a/openbox/focus_cycle_popup.c
+++ b/openbox/focus_cycle_popup.c
@@ -456,6 +456,7 @@ void focus_cycle_popup_show(ObClient *c, gboolean iconic_windows,
         XMapWindow(ob_display, popup.bg);
         XFlush(ob_display);
         popup.mapped = TRUE;
+        screen_hide_desktop_popup();
     }
 }
 

diff --git a/openbox/screen.c b/openbox/screen.c
index 9899cfd803a26729f23384161fe7d6285e97f2bb..7516cfd9d0b34b246f7128390d25753bc033d5d5 100644 (file)
--- a/openbox/screen.c
+++ b/openbox/screen.c
@@ -858,6 +858,12 @@ void screen_show_desktop_popup(guint d)
     g_free(a);
 }
 
+void screen_hide_desktop_popup()
+{
+    ob_main_loop_timeout_remove(ob_main_loop, hide_desktop_popup_func);
+    pager_popup_hide(desktop_popup);
+}
+
 guint screen_find_desktop(guint from, ObDirection dir,
                           gboolean wrap, gboolean linear)
 {

diff --git a/openbox/screen.h b/openbox/screen.h
index 68a132517b8ac45e1c134b41c4a35b49f4453683..39871e33d504fe655a2a757ea9d7f22bc4a8ee17 100644 (file)
--- a/openbox/screen.h
+++ b/openbox/screen.h
@@ -77,6 +77,8 @@ guint screen_find_desktop(guint from, ObDirection dir,
 
 /*! Show the desktop popup/notification */
 void screen_show_desktop_popup(guint d);
+/*! Hide it */
+void screen_hide_desktop_popup();
 
 /*! Shows and focuses the desktop and hides all the client windows, or
   returns to the normal state, showing client windows.