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

Update QRect stuffs.

Browse source 
intersect() => intersected()
addCoords() => adjust()
coords() => getCoords()
moveBy() => translate()
rect() => getRect()

svn path=/trunk/KDE/kdebase/runtime/kstyles/; revision=776918
This commit is contained in:
Bill Egert 2008-02-19 01:58:04 +00:00
parent 696661b4d4
commit c12a07e11a
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
clients/test/test.cpp
View file

@ -268,7 +268,7 @@ bool Decoration::animateMinimize(bool iconify)
for (int step = 0; step < stepCount; step++) {
r.moveBy(dx, dy);
r.translate(dx, dy);
r.setWidth(r.width() - 2 * dx);
r.setHeight(r.height() - 2 * dy);

10
geometry.cpp
View file

@ -118,25 +118,25 @@ void Workspace::updateClientArea( bool force )
i <= numberOfDesktops();
++i )
{
new_wareas[ i ] = new_wareas[ i ].intersect( r );
new_wareas[ i ] = new_wareas[ i ].intersected( r );
for( int iS = 0;
iS < nscreens;
iS ++ )
new_sareas[ i ][ iS ] =
new_sareas[ i ][ iS ].intersect(
new_sareas[ i ][ iS ].intersected(
(*it)->adjustedClientArea( desktopArea, screens[ iS ] )
);
}
else
{
new_wareas[ (*it)->desktop() ] = new_wareas[ (*it)->desktop() ].intersect( r );
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 ].intersect(
new_sareas[ (*it)->desktop() ][ iS ].intersected(
(*it)->adjustedClientArea( desktopArea, screens[ iS ] )
);
}
@ -161,7 +161,7 @@ void Workspace::updateClientArea( bool force )
for( int i = 1;
i <= numberOfDesktops();
++i )
new_wareas[ i ] = new_wareas[ i ].intersect( topmenu_area );
new_wareas[ i ] = new_wareas[ i ].intersected( topmenu_area );
}
bool changed = force;

4
popupinfo.cpp
View file

@ -117,9 +117,9 @@ void PopupInfo::paintContents()
p.setPen(Qt::white);
p.drawText( r, AlignCenter, m_infoString );
p.setPen(Qt::black);
r.moveBy( -1, -1 );
r.translate( -1, -1 );
p.drawText( r, AlignCenter, m_infoString );
r.moveBy( -1, 0 );
r.translate( -1, 0 );
*/
p.drawText( r, Qt::AlignCenter, m_infoString );
}

2
scene.cpp
View file

@ -371,7 +371,7 @@ bool Scene::Window::isVisible() const
return true; // Unmanaged is always visible
// TODO there may be transformations, so ignore this for now
return !toplevel->geometry()
.intersect( QRect( 0, 0, displayWidth(), displayHeight()))
.intersected( QRect( 0, 0, displayWidth(), displayHeight()))
.isEmpty();
}

2
scene_basic.cpp
View file

@ -54,7 +54,7 @@ void SceneBasic::paint( QRegion, ToplevelList windows )
it != windows.end();
++it )
{
QRect r = (*it)->geometry().intersect( QRect( 0, 0, displayWidth(), displayHeight()));
QRect r = (*it)->geometry().intersected( QRect( 0, 0, displayWidth(), displayHeight()));
if( !r.isEmpty())
{
Pixmap pix = (*it)->windowPixmap();