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

swap strictGeometry for isFullScreen case in sizeForClientSize

Browse source 
ratio:
it's the same preference in isFullScreenable, allows clients which do not withdraw their
restrictions (like aspect etc.) or get fullscreen artificially (like through kstart) to start in
"real" fullscreen mode.

BUG: 146741
REVIEW: 104331
This commit is contained in:
Thomas Lübking 2012-03-18 00:56:30 +01:00
parent e99dc3ab5b
commit 218baa9dbe
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
geometry.cpp
View file

@ -1396,7 +1396,7 @@ QSize Client::sizeForClientSize(const QSize& wsize, Sizemode mode, bool noframe)
w += xSizeHint.base_width; w += xSizeHint.base_width;
h += xSizeHint.base_height; h += xSizeHint.base_height;
} }
if (!rules()->checkStrictGeometry(true)) { if (!rules()->checkStrictGeometry(!isFullScreen())) {
// disobey increments and aspect by explicit rule // disobey increments and aspect by explicit rule
w = w1; w = w1;
h = h1; h = h1;
@ -2344,11 +2344,12 @@ void Client::setFullScreen(bool set, bool user)
workspace()->updateClientLayer(this); // active fullscreens get different layer workspace()->updateClientLayer(this); // active fullscreens get different layer
info->setState(isFullScreen() ? NET::FullScreen : 0, NET::FullScreen); info->setState(isFullScreen() ? NET::FullScreen : 0, NET::FullScreen);
updateDecoration(false, false); updateDecoration(false, false);
if (isFullScreen()) if (isFullScreen()) {
if (info->fullscreenMonitors().isSet()) if (info->fullscreenMonitors().isSet())
setGeometry(fullscreenMonitorsArea(info->fullscreenMonitors())); setGeometry(fullscreenMonitorsArea(info->fullscreenMonitors()));
else else
setGeometry(workspace()->clientArea(FullScreenArea, this)); setGeometry(workspace()->clientArea(FullScreenArea, this));
}
else { else {
if (!geom_fs_restore.isNull()) { if (!geom_fs_restore.isNull()) {
int currentScreen = screen(); int currentScreen = screen();