Remove boolean trap in Window::setFullScreen()

In most cases, it doesn't matter because a window is made fullscreen by
user. In a few places, the user arg is incorrectly set to false.
master
Vlad Zahorodnii 2 years ago
parent b41834f1aa
commit 346d4413a1

@ -939,7 +939,7 @@ void MoveResizeWindowTest::testResizeForVirtualKeyboardWithFullScreen()
QVERIFY(frameGeometryChangedSpy.wait());
QCOMPARE(window->frameGeometry(), QRect(100, 0, 500, 100));
window->setFullScreen(true, true);
window->setFullScreen(true);
QVERIFY(surfaceConfigureRequestedSpy.wait());
shellSurface->xdgSurface()->ack_configure(surfaceConfigureRequestedSpy.last()[0].toInt());
Test::render(surface.get(), toplevelConfigureRequestedSpy.last().first().toSize(), Qt::blue);

@ -277,7 +277,7 @@ void WinInfo::changeState(NET::States state, NET::States mask)
state &= mask; // for safety, clear all other bits
if ((mask & NET::FullScreen) != 0 && (state & NET::FullScreen) == 0) {
m_client->setFullScreen(false, false);
m_client->setFullScreen(false);
}
if ((mask & NET::Max) == NET::Max) {
m_client->setMaximize(state & NET::MaxVert, state & NET::MaxHoriz);
@ -313,7 +313,7 @@ void WinInfo::changeState(NET::States state, NET::States mask)
}
// unsetting fullscreen first, setting it last (because e.g. maximize works only for !isFullScreen() )
if ((mask & NET::FullScreen) != 0 && (state & NET::FullScreen) != 0) {
m_client->setFullScreen(true, false);
m_client->setFullScreen(true);
}
}

@ -1206,7 +1206,7 @@ void Workspace::performWindowOperation(Window *window, Options::WindowOperation
window->setOnAllDesktops(!window->isOnAllDesktops());
break;
case Options::FullScreenOp:
window->setFullScreen(!window->isFullScreen(), true);
window->setFullScreen(!window->isFullScreen());
break;
case Options::NoBorderOp:
if (window->userCanSetNoBorder()) {

@ -1887,7 +1887,7 @@ void Window::setupWindowManagementInterface()
performMouseCommand(Options::MouseResize, Cursors::self()->mouse()->pos());
});
connect(w, &PlasmaWindowInterface::fullscreenRequested, this, [this](bool set) {
setFullScreen(set, false);
setFullScreen(set);
});
connect(w, &PlasmaWindowInterface::minimizedRequested, this, [this](bool set) {
setMinimized(set);
@ -3950,9 +3950,8 @@ bool Window::userCanSetFullScreen() const
* Default implementation does nothing.
*
* @param set @c true if the Window has to be shown in full screen mode, otherwise @c false
* @param user @c true if the request is initiated by the user, otherwise @c false
*/
void Window::setFullScreen(bool set, bool user)
void Window::setFullScreen(bool set)
{
qCWarning(KWIN_CORE, "%s doesn't support setting fullscreen state", metaObject()->className());
}
@ -4123,7 +4122,7 @@ void Window::applyWindowRules()
setSkipSwitcher(skipSwitcher());
setKeepAbove(keepAbove());
setKeepBelow(keepBelow());
setFullScreen(isRequestedFullScreen(), true);
setFullScreen(isRequestedFullScreen());
setNoBorder(noBorder());
updateColorScheme();
// FSP

@ -996,7 +996,7 @@ public:
virtual bool isFullScreen() const;
virtual bool isRequestedFullScreen() const;
virtual bool userCanSetFullScreen() const;
virtual void setFullScreen(bool set, bool user = true);
virtual void setFullScreen(bool set);
QRectF geometryRestore() const;
virtual bool isMaximizable() const;

@ -1022,7 +1022,7 @@ bool X11Window::manage(xcb_window_t w, bool isMapped)
maximize(MaximizeMode(session->maximized));
}
if (session->fullscreen != FullScreenNone) {
setFullScreen(true, false);
setFullScreen(true);
setFullscreenGeometryRestore(session->fsrestore);
}
QRectF checkedGeometryRestore = geometryRestore();
@ -1061,7 +1061,7 @@ bool X11Window::manage(xcb_window_t w, bool isMapped)
}
setOpacity(info->opacityF());
setFullScreen(rules()->checkFullScreen(info->state() & NET::FullScreen, !isMapped), false);
setFullScreen(rules()->checkFullScreen(info->state() & NET::FullScreen, !isMapped));
}
updateAllowedActions(true);
@ -4662,7 +4662,7 @@ bool X11Window::userCanSetFullScreen() const
return isNormalWindow() || isDialog();
}
void X11Window::setFullScreen(bool set, bool user)
void X11Window::setFullScreen(bool set)
{
set = rules()->checkFullScreen(set);
@ -4670,7 +4670,7 @@ void X11Window::setFullScreen(bool set, bool user)
if (wasFullscreen == set) {
return;
}
if (user && !userCanSetFullScreen()) {
if (!userCanSetFullScreen()) {
return;
}

@ -152,7 +152,7 @@ public:
QRectF iconGeometry() const override;
bool isFullScreenable() const override;
void setFullScreen(bool set, bool user = true) override;
void setFullScreen(bool set) override;
bool isFullScreen() const override;
bool userCanSetFullScreen() const override;
int fullScreenMode() const

@ -1049,7 +1049,7 @@ void XdgToplevelWindow::handleFullscreenRequested(OutputInterface *output)
{
m_fullScreenRequestedOutput = output ? output->handle() : nullptr;
if (m_isInitialized) {
setFullScreen(/* set */ true, /* user */ false);
setFullScreen(true);
scheduleConfigure();
} else {
m_initialStates |= XdgToplevelInterface::State::FullScreen;
@ -1060,7 +1060,7 @@ void XdgToplevelWindow::handleUnfullscreenRequested()
{
m_fullScreenRequestedOutput.clear();
if (m_isInitialized) {
setFullScreen(/* set */ false, /* user */ false);
setFullScreen(false);
scheduleConfigure();
} else {
m_initialStates &= ~XdgToplevelInterface::State::FullScreen;
@ -1189,7 +1189,7 @@ void XdgToplevelWindow::initialize()
}
maximize(rules()->checkMaximize(initialMaximizeMode(), true));
setFullScreen(rules()->checkFullScreen(initialFullScreenMode(), true), false);
setFullScreen(rules()->checkFullScreen(initialFullScreenMode(), true));
setOnActivities(rules()->checkActivity(activities(), true));
setDesktops(rules()->checkDesktops(desktops(), true));
setDesktopFileName(rules()->checkDesktopFile(desktopFileName(), true));
@ -1430,7 +1430,7 @@ void XdgToplevelWindow::installPalette(ServerSideDecorationPaletteInterface *pal
updateColorScheme();
}
void XdgToplevelWindow::setFullScreen(bool set, bool user)
void XdgToplevelWindow::setFullScreen(bool set)
{
set = rules()->checkFullScreen(set);
if (m_isRequestedFullScreen == set) {
@ -1439,7 +1439,7 @@ void XdgToplevelWindow::setFullScreen(bool set, bool user)
if (isSpecialWindow()) {
return;
}
if (user && !userCanSetFullScreen()) {
if (!userCanSetFullScreen()) {
return;
}

@ -154,7 +154,7 @@ public:
bool takeFocus() override;
bool wantsInput() const override;
bool dockWantsInput() const override;
void setFullScreen(bool set, bool user) override;
void setFullScreen(bool set) override;
void closeWindow() override;
void maximize(MaximizeMode mode) override;

Loading…
Cancel
Save