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

Backported Kephal fixes

Browse source 
svn path=/branches/KDE/4.2/kdebase/workspace/; revision=910288
This commit is contained in:
Guillaume Pothier 2009-01-12 23:46:25 +00:00
parent d593721583
commit 5799f4f9e6
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
geometry.cpp
View file

@ -209,6 +209,8 @@ void Workspace::updateClientArea( bool force )
++it) ++it)
(*it)->checkWorkspacePosition(); (*it)->checkWorkspacePosition();
} }
kDebug(1212) << "Done.";
} }
void Workspace::updateClientArea() void Workspace::updateClientArea()
@ -230,7 +232,9 @@ QRect Workspace::clientArea( clientAreaOption opt, int screen, int desktop ) con
desktop = currentDesktop(); desktop = currentDesktop();
if( screen == -1 ) if( screen == -1 )
screen = activeScreen(); screen = activeScreen();
QRect sarea = !screenarea.isEmpty() // may be empty during KWin initialization
QRect sarea = (!screenarea.isEmpty()
&& screen < screenarea[ desktop ].size()) // screens may be missing during KWin initialization or screen config changes
? screenarea[ desktop ][ screen ] ? screenarea[ desktop ][ screen ]
: Kephal::ScreenUtils::screenGeometry( screen ); : Kephal::ScreenUtils::screenGeometry( screen );
QRect warea = workarea[ desktop ].isNull() QRect warea = workarea[ desktop ].isNull()