summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarkt <markt>2006-06-28 20:58:53 (GMT)
committermarkt <markt>2006-06-28 20:58:53 (GMT)
commitaad6845c91affaff2abb27fb23b301db7ddbbc1e (patch)
tree9d9b3ddf325a40de44a1ab7154c6892f9a623e64
parenta6625f8ca520a8f77ec54035e33af57bf6d5f9e4 (diff)
downloadfluxbox_lack-aad6845c91affaff2abb27fb23b301db7ddbbc1e.zip
fluxbox_lack-aad6845c91affaff2abb27fb23b301db7ddbbc1e.tar.bz2
Linear cycling wasn't affecting normal cycling order (Mark)
-rw-r--r--ChangeLog2
-rw-r--r--src/WorkspaceCmd.cc6
2 files changed, 4 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 516104b..b7dc0ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc2: 2Changes for 1.0rc2:
3*06/06/28: 3*06/06/28:
4 * Linear cycling wasn't affecting normal cycling order (Mark)
5 WorkspaceCmd.cc
4 * Little cleanup of dead functions (Mark) 6 * Little cleanup of dead functions (Mark)
5 Workspace.cc/hh 7 Workspace.cc/hh
6 * Fixed more focus issues with linear cycling and tabbed windows (Mark) 8 * Fixed more focus issues with linear cycling and tabbed windows (Mark)
diff --git a/src/WorkspaceCmd.cc b/src/WorkspaceCmd.cc
index f98db1a..3bd79c5 100644
--- a/src/WorkspaceCmd.cc
+++ b/src/WorkspaceCmd.cc
@@ -55,8 +55,7 @@ void NextWindowCmd::execute() {
55 else { 55 else {
56 // if stacked cycling, then set a watch for 56 // if stacked cycling, then set a watch for
57 // the release of exactly these modifiers 57 // the release of exactly these modifiers
58 if (!fb->watchingScreen() && 58 if (!fb->watchingScreen())
59 !(m_option & FocusControl::CYCLELINEAR))
60 Fluxbox::instance()->watchKeyRelease(*screen, mods); 59 Fluxbox::instance()->watchKeyRelease(*screen, mods);
61 screen->focusControl().nextFocus(m_option); 60 screen->focusControl().nextFocus(m_option);
62 } 61 }
@@ -78,8 +77,7 @@ void PrevWindowCmd::execute() {
78 else { 77 else {
79 // if stacked cycling, then set a watch for 78 // if stacked cycling, then set a watch for
80 // the release of exactly these modifiers 79 // the release of exactly these modifiers
81 if (!fb->watchingScreen() 80 if (!fb->watchingScreen())
82 && !(m_option & FocusControl::CYCLELINEAR))
83 Fluxbox::instance()->watchKeyRelease(*screen, mods); 81 Fluxbox::instance()->watchKeyRelease(*screen, mods);
84 screen->focusControl().prevFocus(m_option); 82 screen->focusControl().prevFocus(m_option);
85 } 83 }