Merge branch 'Plasma/5.16'
This commit is contained in:
commit
3e1b616642
2 changed files with 4 additions and 3 deletions
|
@ -2142,9 +2142,6 @@ void AbstractClient::blockGeometryUpdates(bool block)
|
||||||
|
|
||||||
void AbstractClient::maximize(MaximizeMode m)
|
void AbstractClient::maximize(MaximizeMode m)
|
||||||
{
|
{
|
||||||
if (m == maximizeMode()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
setMaximize(m & MaximizeVertical, m & MaximizeHorizontal);
|
setMaximize(m & MaximizeVertical, m & MaximizeHorizontal);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -839,6 +839,10 @@ void ShellClient::changeMaximize(bool horizontal, bool vertical, bool adjust)
|
||||||
}
|
}
|
||||||
// TODO: add more checks as in Client
|
// TODO: add more checks as in Client
|
||||||
|
|
||||||
|
if (m_requestedMaximizeMode == oldMode) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// call into decoration update borders
|
// call into decoration update borders
|
||||||
if (isDecorated() && decoration()->client() && !(options->borderlessMaximizedWindows() && m_requestedMaximizeMode == KWin::MaximizeFull)) {
|
if (isDecorated() && decoration()->client() && !(options->borderlessMaximizedWindows() && m_requestedMaximizeMode == KWin::MaximizeFull)) {
|
||||||
changeMaximizeRecursion = true;
|
changeMaximizeRecursion = true;
|
||||||
|
|
Loading…
Reference in a new issue