vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[wayland] WlShell cache the pre-maximised geometry before going fullscreen 

Summary:
In shell surface, maximise mode and fullscreen are exclusive
fullscreen->toplevel should restore the state we had before maximising

Test Plan: testMaximisedToFullscreen unit test

Reviewers: #kwin, graesslin

Reviewed By: #kwin, graesslin

Subscribers: kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D16921
icc-effect-5.17.5
David Edmundson 2018-11-16 11:59:33 +00:00
parent 2e42f4c1a3
commit 5f2e0b7299
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
shell_client.cpp
View File

@ -944,10 +944,17 @@ void ShellClient::setFullScreen(bool set, bool user)
set = rules()->checkFullScreen(set && !isSpecialWindow());
setShade(ShadeNone);
bool was_fs = isFullScreen();
if (was_fs)
if (was_fs) {
workspace()->updateFocusMousePosition(Cursor::pos()); // may cause leave event
else
m_geomFsRestore = geometry();
} else {
// in shell surface, maximise mode and fullscreen are exclusive
// fullscreen->toplevel should restore the state we had before maximising
if (m_shellSurface && m_maximizeMode == MaximizeMode::MaximizeFull) {
m_geomFsRestore = m_geomMaximizeRestore;
} else {
m_geomFsRestore = geometry();
}
}
m_fullScreen = set;
if (was_fs == isFullScreen())
return;