yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid mixing current and next fullscreen states more

Browse source 
Mixing those two can make fullscreen mode behavior undefined.
This commit is contained in:
Vlad Zahorodnii 2022-09-02 10:22:33 +03:00
parent 4a6e416289
commit e22c6160fa
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/window.cpp
View file

@ -1606,7 +1606,7 @@ bool Window::startInteractiveMoveResize()
if (QApplication::activePopupWidget() != nullptr) { if (QApplication::activePopupWidget() != nullptr) {
return false; // popups have grab return false; // popups have grab
} }
if (isFullScreen() && (workspace()->outputs().count() < 2 || !isMovableAcrossScreens())) { if (isRequestedFullScreen() && (workspace()->outputs().count() < 2 || !isMovableAcrossScreens())) {
return false; return false;
} }
if (!doStartInteractiveMoveResize()) { if (!doStartInteractiveMoveResize()) {
@ -1687,7 +1687,7 @@ void Window::finishInteractiveMoveResize(bool cancel)
} }
if (moveResizeOutput() != interactiveMoveResizeStartOutput()) { if (moveResizeOutput() != interactiveMoveResizeStartOutput()) {
workspace()->sendWindowToOutput(this, moveResizeOutput()); // checks rule validity workspace()->sendWindowToOutput(this, moveResizeOutput()); // checks rule validity
if (isFullScreen() || requestedMaximizeMode() != MaximizeRestore) { if (isRequestedFullScreen() || requestedMaximizeMode() != MaximizeRestore) {
checkWorkspacePosition(); checkWorkspacePosition();
} }
} }
@ -1790,7 +1790,7 @@ void Window::handleInteractiveMoveResize(const QPointF &local, const QPointF &gl
{ {
const QRectF oldGeo = moveResizeGeometry(); const QRectF oldGeo = moveResizeGeometry();
handleInteractiveMoveResize(local.x(), local.y(), global.x(), global.y()); handleInteractiveMoveResize(local.x(), local.y(), global.x(), global.y());
if (!isFullScreen() && isInteractiveMove()) { if (!isRequestedFullScreen() && isInteractiveMove()) {
if (quickTileMode() != QuickTileMode(QuickTileFlag::None) && oldGeo != moveResizeGeometry()) { if (quickTileMode() != QuickTileMode(QuickTileFlag::None) && oldGeo != moveResizeGeometry()) {
GeometryUpdatesBlocker blocker(this); GeometryUpdatesBlocker blocker(this);
setQuickTileMode(QuickTileFlag::None); setQuickTileMode(QuickTileFlag::None);
@ -2033,7 +2033,7 @@ void Window::handleInteractiveMoveResize(int x, int y, int x_root, int y_root)
if (!isMovable()) { // isMovableAcrossScreens() must have been true to get here if (!isMovable()) { // isMovableAcrossScreens() must have been true to get here
// Special moving of maximized windows on Xinerama screens // Special moving of maximized windows on Xinerama screens
Output *output = workspace()->outputAt(globalPos); Output *output = workspace()->outputAt(globalPos);
if (isFullScreen()) { if (isRequestedFullScreen()) {
nextMoveResizeGeom = workspace()->clientArea(FullScreenArea, this, output); nextMoveResizeGeom = workspace()->clientArea(FullScreenArea, this, output);
} else { } else {
nextMoveResizeGeom = workspace()->clientArea(MaximizeArea, this, output); nextMoveResizeGeom = workspace()->clientArea(MaximizeArea, this, output);
@ -3251,7 +3251,7 @@ void Window::setVirtualKeyboardGeometry(const QRectF &geo)
m_virtualKeyboardGeometry = geo; m_virtualKeyboardGeometry = geo;
// Don't resize Desktop and fullscreen windows // Don't resize Desktop and fullscreen windows
if (isFullScreen() || isDesktop()) { if (isRequestedFullScreen() || isDesktop()) {
return; return;
} }
@ -4456,7 +4456,7 @@ void Window::applyWindowRules()
setSkipSwitcher(skipSwitcher()); setSkipSwitcher(skipSwitcher());
setKeepAbove(keepAbove()); setKeepAbove(keepAbove());
setKeepBelow(keepBelow()); setKeepBelow(keepBelow());
setFullScreen(isFullScreen(), true); setFullScreen(isRequestedFullScreen(), true);
setNoBorder(noBorder()); setNoBorder(noBorder());
updateColorScheme(); updateColorScheme();
// FSP // FSP