Commit af666ef7 authored by David Edmundson's avatar David Edmundson

Remove unused references to forceWindowed

Test Plan: Compiles

Reviewers: #plasma, mart

Reviewed By: #plasma, mart

Subscribers: mart, plasma-devel

Tags: #plasma

Differential Revision: https://phabricator.kde.org/D6648
parent 74fe83cb
......@@ -19,7 +19,6 @@
#include "desktopview.h"
#include "containmentconfigview.h"
#include "shellcorona.h"
#include "shellmanager.h"
#include "krunner_interface.h"
#include <QQmlEngine>
......@@ -114,7 +113,7 @@ void DesktopView::adaptToScreen()
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 @@ void DesktopView::ensureWindowType()
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);
......
......@@ -43,7 +43,6 @@ static const QStringList s_shellsDirs(QStandardPaths::locateAll(QStandardPaths::
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;
......
......@@ -42,7 +42,6 @@ public:
static ShellManager * instance();
~ShellManager() override;
static bool s_forceWindowed;
static bool s_standaloneOption;
static QString s_fixedShell;
static QString s_testModeLayout;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment