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

Avoid -1 as array index.

Browse source 
svn path=/trunk/kdebase/kwin/; revision=290548
This commit is contained in:
Luboš Luňák 2004-02-23 14:20:13 +00:00
parent 37d83f6c9c
commit 3575a90230
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
geometry.cpp
View file

@ -208,9 +208,12 @@ QRect Workspace::clientArea( clientAreaOption opt, const QPoint& p, int desktop
if( desktop == NETWinInfo::OnAllDesktops || desktop == 0 ) if( desktop == NETWinInfo::OnAllDesktops || desktop == 0 )
desktop = currentDesktop(); desktop = currentDesktop();
QDesktopWidget *desktopwidget = KApplication::desktop(); QDesktopWidget *desktopwidget = KApplication::desktop();
int screen = desktopwidget->screenNumber( p );
if( screen < 0 )
screen = desktopwidget->primaryScreen();
QRect sarea = screenarea // may be NULL during KWin initialization QRect sarea = screenarea // may be NULL during KWin initialization
? screenarea[ desktop ][ desktopwidget->screenNumber( p ) ] ? screenarea[ desktop ][ screen ]
: desktopwidget->screenGeometry( desktopwidget->screenNumber( p )); : desktopwidget->screenGeometry( screen );
QRect warea = workarea[ desktop ].isNull() QRect warea = workarea[ desktop ].isNull()
? QApplication::desktop()->geometry() ? QApplication::desktop()->geometry()
: workarea[ desktop ]; : workarea[ desktop ];
@ -223,7 +226,7 @@ QRect Workspace::clientArea( clientAreaOption opt, const QPoint& p, int desktop
return warea; return warea;
case MaximizeFullArea: case MaximizeFullArea:
if (options->xineramaMaximizeEnabled) if (options->xineramaMaximizeEnabled)
return desktopwidget->screenGeometry( desktopwidget->screenNumber( p )); return desktopwidget->screenGeometry( screen );
else else
return desktopwidget->geometry(); return desktopwidget->geometry();
case PlacementArea: case PlacementArea: