diff --git a/src/focuschain.cpp b/src/focuschain.cpp index 89d0a1bc3d..33b0cb7241 100644 --- a/src/focuschain.cpp +++ b/src/focuschain.cpp @@ -212,21 +212,7 @@ Window *FocusChain::nextForDesktop(Window *reference, VirtualDesktop *desktop) c void FocusChain::makeFirstInChain(Window *window, Chain &chain) { chain.removeAll(window); - if (options->moveMinimizedWindowsToEndOfTabBoxFocusChain()) { - if (window->isMinimized()) { // add it before the first minimized ... - for (int i = chain.count() - 1; i >= 0; --i) { - if (chain.at(i)->isMinimized()) { - chain.insert(i + 1, window); - return; - } - } - chain.prepend(window); // ... or at end of chain - } else { - chain.append(window); - } - } else { - chain.append(window); - } + chain.append(window); } void FocusChain::makeLastInChain(Window *window, Chain &chain) diff --git a/src/kwin.kcfg b/src/kwin.kcfg index 00f9ee2366..7b9190633a 100644 --- a/src/kwin.kcfg +++ b/src/kwin.kcfg @@ -319,9 +319,6 @@ thumbnails - - false - diff --git a/src/options.cpp b/src/options.cpp index 3ee7d3f93f..a4057789ed 100644 --- a/src/options.cpp +++ b/src/options.cpp @@ -68,7 +68,6 @@ Options::Options(QObject *parent) , m_glPreferBufferSwap(Options::defaultGlPreferBufferSwap()) , m_glPlatformInterface(Options::defaultGlPlatformInterface()) , m_windowsBlockCompositing(true) - , m_MoveMinimizedWindowsToEndOfTabBoxFocusChain(false) , OpTitlebarDblClick(Options::defaultOperationTitlebarDblClick()) , CmdActiveTitlebar1(Options::defaultCommandActiveTitlebar1()) , CmdActiveTitlebar2(Options::defaultCommandActiveTitlebar2()) @@ -611,14 +610,6 @@ void Options::setWindowsBlockCompositing(bool value) Q_EMIT windowsBlockCompositingChanged(); } -void Options::setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool value) -{ - if (m_MoveMinimizedWindowsToEndOfTabBoxFocusChain == value) { - return; - } - m_MoveMinimizedWindowsToEndOfTabBoxFocusChain = value; -} - void Options::setGlPreferBufferSwap(char glPreferBufferSwap) { if (glPreferBufferSwap == 'a') { @@ -817,7 +808,6 @@ void Options::syncFromKcfgc() setElectricBorderTiling(m_settings->electricBorderTiling()); setElectricBorderCornerRatio(m_settings->electricBorderCornerRatio()); setWindowsBlockCompositing(m_settings->windowsBlockCompositing()); - setMoveMinimizedWindowsToEndOfTabBoxFocusChain(m_settings->moveMinimizedWindowsToEndOfTabBoxFocusChain()); setLatencyPolicy(m_settings->latencyPolicy()); setRenderTimeEstimator(m_settings->renderTimeEstimator()); setAllowTearing(m_settings->allowTearing()); diff --git a/src/options.h b/src/options.h index 667af178a3..78730a7b79 100644 --- a/src/options.h +++ b/src/options.h @@ -707,11 +707,6 @@ public: return m_windowsBlockCompositing; } - bool moveMinimizedWindowsToEndOfTabBoxFocusChain() const - { - return m_MoveMinimizedWindowsToEndOfTabBoxFocusChain; - } - QStringList modifierOnlyDBusShortcut(Qt::KeyboardModifier mod) const; LatencyPolicy latencyPolicy() const; RenderTimeEstimator renderTimeEstimator() const; @@ -773,7 +768,6 @@ public: void setGlPreferBufferSwap(char glPreferBufferSwap); void setGlPlatformInterface(OpenGLPlatformInterface interface); void setWindowsBlockCompositing(bool set); - void setMoveMinimizedWindowsToEndOfTabBoxFocusChain(bool set); void setLatencyPolicy(LatencyPolicy policy); void setRenderTimeEstimator(RenderTimeEstimator estimator); void setAllowTearing(bool allow); @@ -1032,7 +1026,6 @@ private: GlSwapStrategy m_glPreferBufferSwap; OpenGLPlatformInterface m_glPlatformInterface; bool m_windowsBlockCompositing; - bool m_MoveMinimizedWindowsToEndOfTabBoxFocusChain; WindowOperation OpTitlebarDblClick; WindowOperation opMaxButtonRightClick = defaultOperationMaxButtonRightClick(); diff --git a/src/window.cpp b/src/window.cpp index 0e58e16bac..ae4ef9c3e8 100644 --- a/src/window.cpp +++ b/src/window.cpp @@ -1307,11 +1307,6 @@ void Window::minimize() doMinimize(); updateWindowRules(Rules::Minimize); - - if (options->moveMinimizedWindowsToEndOfTabBoxFocusChain()) { - Workspace::self()->focusChain()->update(this, FocusChain::MakeFirstMinimized); - } - Q_EMIT minimizedChanged(); }