summaryrefslogtreecommitdiff
path: root/openbox/focus_cycle.c
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2009-12-17 15:43:46 -0500
committerDana Jansens <danakj@orodu.net>2009-12-17 16:51:01 -0500
commita067628051f5ee91f6e759ff85c8e31a7123d571 (patch)
tree47abf901024bd8f80b207020cbe3567163a24129 /openbox/focus_cycle.c
parent24f6b59fe36e06d06bd1139a99e08cb6e06d6682 (diff)
Hide the focus popup if we change desktops and one of the windows in it disappears
Diffstat (limited to 'openbox/focus_cycle.c')
-rw-r--r--openbox/focus_cycle.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/openbox/focus_cycle.c b/openbox/focus_cycle.c
index 20a738f4..8d047497 100644
--- a/openbox/focus_cycle.c
+++ b/openbox/focus_cycle.c
@@ -56,12 +56,8 @@ void focus_cycle_stop(ObClient *ifclient)
/* stop focus cycling if the given client is a valid focus target,
and so the cycling is being disrupted */
if (focus_cycle_target && ifclient &&
- focus_valid_target(ifclient, TRUE,
- focus_cycle_iconic_windows,
- focus_cycle_all_desktops,
- focus_cycle_dock_windows,
- focus_cycle_desktop_windows,
- FALSE))
+ (ifclient == focus_cycle_target ||
+ focus_cycle_popup_is_showing(ifclient)))
{
focus_cycle(TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE,TRUE);
focus_directional_cycle(0, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE);