all repos — fluxbox @ aad6845c91affaff2abb27fb23b301db7ddbbc1e

custom fork of the fluxbox windowmanager 

Linear cycling wasn't affecting normal cycling order (Mark)
markt markt
commit

aad6845c91affaff2abb27fb23b301db7ddbbc1e

parent

a6625f8ca520a8f77ec54035e33af57bf6d5f9e4

2 files changed, 4 insertions(+), 4 deletions(-)

jump to
M ChangeLog → ChangeLog 
@@ -1,6 +1,8 @@ 
  (Format: Year/Month/Day)
 Changes for 1.0rc2:
 *06/06/28:
+   * Linear cycling wasn't affecting normal cycling order (Mark)
+     WorkspaceCmd.cc
    * Little cleanup of dead functions (Mark)
      Workspace.cc/hh
    * Fixed more focus issues with linear cycling and tabbed windows (Mark)
M src/WorkspaceCmd.cc → src/WorkspaceCmd.cc 
@@ -55,8 +55,7 @@ screen->focusControl().nextFocus(m_option | FocusControl::CYCLELINEAR);
             else {
                 // if stacked cycling, then set a watch for
                 // the release of exactly these modifiers
-                if (!fb->watchingScreen() &&
-                    !(m_option & FocusControl::CYCLELINEAR))
+                if (!fb->watchingScreen())
                     Fluxbox::instance()->watchKeyRelease(*screen, mods);
                 screen->focusControl().nextFocus(m_option);
             }

@@ -78,8 +77,7 @@ screen->focusControl().prevFocus(m_option | FocusControl::CYCLELINEAR);
             else {
                 // if stacked cycling, then set a watch for
                 // the release of exactly these modifiers
-                if (!fb->watchingScreen()
-                    && !(m_option & FocusControl::CYCLELINEAR))
+                if (!fb->watchingScreen())
                     Fluxbox::instance()->watchKeyRelease(*screen, mods);
                 screen->focusControl().prevFocus(m_option);
             }