aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-08-03 21:23:08 (GMT)
committermarkt <markt>2006-08-03 21:23:08 (GMT)
commit52d3f3f6b6f1c8ccf899f8722ea9befe76da9182 (patch)
tree1cbc99d06d728ff58e0f35d39c87e3171126adc1
parent81c650c63e3fdbe535cd4a292a4afb07118e1241 (diff)
downloadfluxbox_paul-52d3f3f6b6f1c8ccf899f8722ea9befe76da9182.zip
fluxbox_paul-52d3f3f6b6f1c8ccf899f8722ea9befe76da9182.tar.bz2
don't raise a window after cycling if it has been minimized
-rw-r--r--ChangeLog2
-rw-r--r--src/FocusControl.cc4
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d9fb470..9477dc5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/08/03: 3*06/08/03:
4 * Don't raise a window after cycling if it has been minimized (Mark)
5 FocusControl.cc
4 * Added support for negative arguments to the `Tab' key command to count 6 * Added support for negative arguments to the `Tab' key command to count
5 backwards from the last tab in the group (Mark) 7 backwards from the last tab in the group (Mark)
6 CurrentWindowCmd.cc 8 CurrentWindowCmd.cc
diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 03f1dc5..dafad30 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -163,7 +163,9 @@ void FocusControl::stopCyclingFocus() {
163 // in which case we'll do a proper revert focus 163 // in which case we'll do a proper revert focus
164 if (m_cycling_creation_order && m_cycling_window != m_creation_order_list.end()) 164 if (m_cycling_creation_order && m_cycling_window != m_creation_order_list.end())
165 m_cycling_window = find(m_focused_list.begin(),m_focused_list.end(),*m_cycling_window); 165 m_cycling_window = find(m_focused_list.begin(),m_focused_list.end(),*m_cycling_window);
166 if (m_cycling_window != m_focused_list.end() && m_cycling_window != m_creation_order_list.end()) { 166 if (m_cycling_window != m_focused_list.end() &&
167 m_cycling_window != m_creation_order_list.end() &&
168 (*m_cycling_window)->fbwindow()->isVisible()) {
167 WinClient *client = *m_cycling_window; 169 WinClient *client = *m_cycling_window;
168 m_focused_list.erase(m_cycling_window); 170 m_focused_list.erase(m_cycling_window);
169 m_focused_list.push_front(client); 171 m_focused_list.push_front(client);