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

Fix indentation.

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=839198
This commit is contained in:
Luboš Luňák 2008-07-29 13:44:08 +00:00
parent 1802a82513
commit e7b73e9e5f
1 changed files with 49 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
geometry.cpp
View file

@ -95,62 +95,63 @@ void Workspace::updateClientArea( bool force )
iS < nscreens;
iS ++ )
{
screens [iS] = desktopwidget -> screenGeometry (iS);
screens [iS] = desktopwidget -> screenGeometry (iS);
}
for( int i = 1;
i <= numberOfDesktops();
++i )
{
new_wareas[ i ] = desktopArea;
new_sareas[ i ].resize( nscreens );
for( int iS = 0;
iS < nscreens;
iS ++ )
new_sareas[ i ][ iS ] = screens[ iS ];
new_wareas[ i ] = desktopArea;
new_sareas[ i ].resize( nscreens );
for( int iS = 0;
iS < nscreens;
iS ++ )
new_sareas[ i ][ iS ] = screens[ iS ];
}
for ( ClientList::ConstIterator it = clients.begin(); it != clients.end(); ++it)
{
if( !(*it)->hasStrut())
continue;
QRect r = (*it)->adjustedClientArea( desktopArea, desktopArea );
if( (*it)->isOnAllDesktops())
for( int i = 1;
i <= numberOfDesktops();
++i )
{
new_wareas[ i ] = new_wareas[ i ].intersected( r );
for( int iS = 0;
iS < nscreens;
iS ++ )
new_sareas[ i ][ iS ] =
new_sareas[ i ][ iS ].intersected(
(*it)->adjustedClientArea( desktopArea, screens[ iS ] )
);
}
else
if( !(*it)->hasStrut())
continue;
QRect r = (*it)->adjustedClientArea( desktopArea, desktopArea );
if( (*it)->isOnAllDesktops())
{
for( int i = 1;
i <= numberOfDesktops();
++i )
{
new_wareas[ (*it)->desktop() ] = new_wareas[ (*it)->desktop() ].intersected( r );
for( int iS = 0;
iS < nscreens;
iS ++ )
{
// kDebug () << "adjusting new_sarea: " << screens[ iS ];
new_sareas[ (*it)->desktop() ][ iS ] =
new_sareas[ (*it)->desktop() ][ iS ].intersected(
(*it)->adjustedClientArea( desktopArea, screens[ iS ] )
);
}
new_wareas[ i ] = new_wareas[ i ].intersected( r );
for( int iS = 0;
iS < nscreens;
iS ++ )
{
new_sareas[ i ][ iS ] = new_sareas[ i ][ iS ].intersected(
(*it)->adjustedClientArea( desktopArea, screens[ iS ] ));
}
}
}
else
{
new_wareas[ (*it)->desktop() ] = new_wareas[ (*it)->desktop() ].intersected( r );
for( int iS = 0;
iS < nscreens;
iS ++ )
{
// kDebug () << "adjusting new_sarea: " << screens[ iS ];
new_sareas[ (*it)->desktop() ][ iS ]
= new_sareas[ (*it)->desktop() ][ iS ].intersected(
(*it)->adjustedClientArea( desktopArea, screens[ iS ] ));
}
}
}
#if 0
for( int i = 1;
i <= numberOfDesktops();
++i )
{
for( int iS = 0;
iS < nscreens;
iS ++ )
kDebug () << "new_sarea: " << new_sareas[ i ][ iS ];
for( int iS = 0;
iS < nscreens;
iS ++ )
kDebug () << "new_sarea: " << new_sareas[ i ][ iS ];
}
#endif
// TODO topmenu update for screenarea changes?
@ -173,15 +174,15 @@ void Workspace::updateClientArea( bool force )
!changed && i <= numberOfDesktops();
++i )
{
if( workarea[ i ] != new_wareas[ i ] )
if( workarea[ i ] != new_wareas[ i ] )
changed = true;
if( screenarea[ i ].size() != new_sareas[ i ].size())
changed = true;
for( int iS = 0;
!changed && iS < nscreens;
iS ++ )
if (new_sareas[ i ][ iS ] != screenarea [ i ][ iS ])
changed = true;
if( screenarea[ i ].size() != new_sareas[ i ].size())
changed = true;
for( int iS = 0;
!changed && iS < nscreens;
iS ++ )
if (new_sareas[ i ][ iS ] != screenarea [ i ][ iS ])
changed = true;
}
if ( changed )