diff options
| author | Mikael Magnusson <mikachu@comhem.se> | 2007-08-22 17:36:40 +0200 |
|---|---|---|
| committer | Mikael Magnusson <mikachu@comhem.se> | 2007-08-22 18:00:12 +0200 |
| commit | e4f24d84a0f9cf81f6228bbe51a30128f451e041 (patch) | |
| tree | 77acaa3a519a3ad5c6ee5254fe1e1d05ed32ed09 | |
| parent | f4aeb10397713cafb248bbce439e9b329decd56b (diff) | |
Hide the desktop cycle popup when the focus cycle popup is shown.
| -rw-r--r-- | openbox/focus_cycle_popup.c | 1 | ||||
| -rw-r--r-- | openbox/screen.c | 6 | ||||
| -rw-r--r-- | openbox/screen.h | 2 |
3 files changed, 9 insertions, 0 deletions
diff --git a/openbox/focus_cycle_popup.c b/openbox/focus_cycle_popup.c index e0a8080f..1869cc35 100644 --- 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 9899cfd8..7516cfd9 100644 --- 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 68a13251..39871e33 100644 --- 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. |