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

wayland: Simplify xdg-shell's maximize mode implementation

Browse source 
XdgToplevelClient::changeMaximize() will unset quick tile mode after
maximizing the window.
This commit is contained in:
Vlad Zahorodnii 2022-02-03 10:43:36 +02:00
parent 6e26494b4e
commit 185395caab
1 changed files with 2 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/xdgshellclient.cpp
View file

@ -1670,21 +1670,6 @@ void XdgToplevelClient::changeMaximize(bool horizontal, bool vertical, bool adju
setGeometryRestore(savedGeometry); setGeometryRestore(savedGeometry);
} }
// Conditional quick tiling exit points
const auto oldQuickTileMode = quickTileMode();
if (quickTileMode() != QuickTileMode(QuickTileFlag::None)) {
if (oldMode == MaximizeFull &&
!clientArea.contains(geometryRestore().center())) {
// Not restoring on the same screen
// TODO: The following doesn't work for some reason
//quick_tile_mode = QuickTileNone; // And exit quick tile mode manually
} else if ((oldMode == MaximizeVertical && m_requestedMaximizeMode == MaximizeRestore) ||
(oldMode == MaximizeFull && m_requestedMaximizeMode == MaximizeHorizontal)) {
// Modifying geometry of a tiled window
updateQuickTileMode(QuickTileFlag::None); // Exit quick tile mode without restoring geometry
}
}
const MaximizeMode delta = m_requestedMaximizeMode ^ oldMode; const MaximizeMode delta = m_requestedMaximizeMode ^ oldMode;
QRect geometry = oldGeometry; QRect geometry = oldGeometry;
@ -1724,13 +1709,14 @@ void XdgToplevelClient::changeMaximize(bool horizontal, bool vertical, bool adju
} }
} }
const auto oldQuickTileMode = quickTileMode();
if (m_requestedMaximizeMode == MaximizeFull) { if (m_requestedMaximizeMode == MaximizeFull) {
if (options->electricBorderMaximize()) { if (options->electricBorderMaximize()) {
updateQuickTileMode(QuickTileFlag::Maximize); updateQuickTileMode(QuickTileFlag::Maximize);
} else { } else {
updateQuickTileMode(QuickTileFlag::None); updateQuickTileMode(QuickTileFlag::None);
} }
} else if (m_requestedMaximizeMode == MaximizeRestore) { } else {
updateQuickTileMode(QuickTileFlag::None); updateQuickTileMode(QuickTileFlag::None);
} }