diff --git a/shell/desktopview.cpp b/shell/desktopview.cpp --- a/shell/desktopview.cpp +++ b/shell/desktopview.cpp @@ -19,7 +19,6 @@ #include "desktopview.h" #include "containmentconfigview.h" #include "shellcorona.h" -#include "shellmanager.h" #include "krunner_interface.h" #include @@ -114,7 +113,7 @@ this, &DesktopView::screenGeometryChanged); } - if ((m_windowType == Desktop || m_windowType == WindowedDesktop) && !ShellManager::s_forceWindowed) { + if (m_windowType == Desktop || m_windowType == WindowedDesktop) { screenGeometryChanged(); connect(m_screenToFollow.data(), &QScreen::geometryChanged, @@ -149,7 +148,7 @@ return; } - if (m_windowType == Window || ShellManager::s_forceWindowed) { + if (m_windowType == Window) { setFlags(Qt::Window); KWindowSystem::setType(winId(), NET::Normal); KWindowSystem::clearState(winId(), NET::FullScreen); diff --git a/shell/shellmanager.h b/shell/shellmanager.h --- a/shell/shellmanager.h +++ b/shell/shellmanager.h @@ -42,7 +42,6 @@ static ShellManager * instance(); ~ShellManager() override; - static bool s_forceWindowed; static bool s_standaloneOption; static QString s_fixedShell; static QString s_testModeLayout; diff --git a/shell/shellmanager.cpp b/shell/shellmanager.cpp --- a/shell/shellmanager.cpp +++ b/shell/shellmanager.cpp @@ -43,7 +43,6 @@ QStandardPaths::LocateDirectory)); static const QString s_shellLoaderPath = QStringLiteral("/contents/loader.qml"); -bool ShellManager::s_forceWindowed = false; bool ShellManager::s_standaloneOption = false; QString ShellManager::s_fixedShell; QString ShellManager::s_testModeLayout;