summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-07-10 18:00:42 (GMT)
committermarkt <markt>2006-07-10 18:00:42 (GMT)
commitbf3aee5f674a7ce2e27ad6294c4c19db9885aa7b (patch)
tree380fb02fd19b31259f6952c859b2d65324d394ff
parent7a79953f04cb236a2fa662d841eacf3b572eb505 (diff)
downloadfluxbox_lack-bf3aee5f674a7ce2e27ad6294c4c19db9885aa7b.zip
fluxbox_lack-bf3aee5f674a7ce2e27ad6294c4c19db9885aa7b.tar.bz2
next/prevwindow toolbar buttons break mousefocus
-rw-r--r--ChangeLog3
-rw-r--r--src/FocusControl.cc3
-rw-r--r--src/WorkspaceCmd.cc4
3 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 33f0de9..90f7627 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/07/10:
4 * Next/PrevWindow toolbar buttons break MouseFocus: bug #1519913 (Mark)
5 WorkspaceCmd.cc FocusControl.cc
3*06/07/08: 6*06/07/08:
4 * Fix implementation of _NET_MOVERESIZE_WINDOW (Mark) 7 * Fix implementation of _NET_MOVERESIZE_WINDOW (Mark)
5 Ewmh.cc 8 Ewmh.cc
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