diff options
author | markt <markt> | 2006-07-10 18:00:42 (GMT) |
---|---|---|
committer | markt <markt> | 2006-07-10 18:00:42 (GMT) |
commit | bf3aee5f674a7ce2e27ad6294c4c19db9885aa7b (patch) | |
tree | 380fb02fd19b31259f6952c859b2d65324d394ff /src | |
parent | 7a79953f04cb236a2fa662d841eacf3b572eb505 (diff) | |
download | fluxbox_paul-bf3aee5f674a7ce2e27ad6294c4c19db9885aa7b.zip fluxbox_paul-bf3aee5f674a7ce2e27ad6294c4c19db9885aa7b.tar.bz2 |
next/prevwindow toolbar buttons break mousefocus
Diffstat (limited to 'src')
-rw-r--r-- | src/FocusControl.cc | 3 | ||||
-rw-r--r-- | src/WorkspaceCmd.cc | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/FocusControl.cc b/src/FocusControl.cc index 48ae36f..6f919ef 100644 --- a/src/FocusControl.cc +++ b/src/FocusControl.cc | |||
@@ -86,7 +86,8 @@ void FocusControl::cycleFocus(int opts, bool cycle_reverse) { | |||
86 | 86 | ||
87 | FocusedWindows *window_list = (opts & CYCLELINEAR) ? &m_creation_order_list : &m_focused_list; | 87 | FocusedWindows *window_list = (opts & CYCLELINEAR) ? &m_creation_order_list : &m_focused_list; |
88 | if (!m_cycling_focus) { | 88 | if (!m_cycling_focus) { |
89 | m_cycling_focus = true; | 89 | if (Fluxbox::instance()->watchingScreen()) |
90 | m_cycling_focus = true; | ||
90 | if (opts & CYCLELINEAR) { | 91 | if (opts & CYCLELINEAR) { |
91 | m_cycling_creation_order = true; | 92 | m_cycling_creation_order = true; |
92 | m_cycling_window = find(window_list->begin(),window_list->end(),s_focused_window); | 93 | m_cycling_window = find(window_list->begin(),window_list->end(),s_focused_window); |
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc index 3bd79c5..c3dd402 100644 --- a/src/WorkspaceCmd.cc +++ b/src/WorkspaceCmd.cc | |||
@@ -60,7 +60,7 @@ void NextWindowCmd::execute() { | |||
60 | screen->focusControl().nextFocus(m_option); | 60 | screen->focusControl().nextFocus(m_option); |
61 | } | 61 | } |
62 | } else | 62 | } else |
63 | screen->focusControl().nextFocus(m_option); | 63 | screen->focusControl().nextFocus(m_option | FocusControl::CYCLELINEAR); |
64 | } | 64 | } |
65 | } | 65 | } |
66 | 66 | ||
@@ -82,7 +82,7 @@ void PrevWindowCmd::execute() { | |||
82 | screen->focusControl().prevFocus(m_option); | 82 | screen->focusControl().prevFocus(m_option); |
83 | } | 83 | } |
84 | } else | 84 | } else |
85 | screen->focusControl().nextFocus(m_option); | 85 | screen->focusControl().nextFocus(m_option | FocusControl::CYCLELINEAR); |
86 | } | 86 | } |
87 | } | 87 | } |
88 | 88 | ||