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

Fix a lockup of desktop grid when clicking a window to select the desktop

Browse source 
svn path=/trunk/KDE/kdebase/workspace/; revision=1049608
This commit is contained in:
Martin Gräßlin 2009-11-15 14:53:33 +00:00
parent b95daae72a
commit b7f71f746a
1 changed files with 24 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
effects/desktopgrid/desktopgrid.cpp
View file

@ -407,7 +407,22 @@ void DesktopGridEffect::windowInputMouseEvent( Window, QEvent* e )
(me->pos() - dragStartPos).manhattanLength() > KGlobalSettings::dndEventDelay() ) (me->pos() - dragStartPos).manhattanLength() > KGlobalSettings::dndEventDelay() )
{ // Handle window moving { // Handle window moving
if( !wasWindowMove ) // Activate on move if( !wasWindowMove ) // Activate on move
{
effects->activateWindow( windowMove ); effects->activateWindow( windowMove );
if( isUsingPresentWindows() && !windowMove->isOnAllDesktops() )
{
WindowMotionManager& manager = m_managers[ (windowMove->desktop()-1)*(effects->numScreens()) + windowMove->screen() ];
const QRectF transformedGeo = manager.transformedGeometry( windowMove );
const QPointF pos = scalePos( transformedGeo.topLeft().toPoint(), windowMove->desktop(), windowMove->screen() );
const QSize size( scale[windowMove->screen()] * (float)transformedGeo.width(),
scale[windowMove->screen()] * (float)transformedGeo.height() );
m_windowMoveGeometry = QRect( pos.toPoint(), size );
m_windowMoveStartPoint = me->pos();
manager.unmanage( windowMove );
m_proxy->calculateWindowTransformations( manager.managedWindows(), windowMove->screen(), manager );
}
}
wasWindowMove = true; wasWindowMove = true;
if( windowMove->isMovable() && !isUsingPresentWindows() ) if( windowMove->isMovable() && !isUsingPresentWindows() )
{ {
@ -485,19 +500,6 @@ void DesktopGridEffect::windowInputMouseEvent( Window, QEvent* e )
windowMoveDiff = w->pos() - unscalePos( me->pos(), NULL ); windowMoveDiff = w->pos() - unscalePos( me->pos(), NULL );
windowMove = w; windowMove = w;
effects->setElevatedWindow( windowMove, true ); effects->setElevatedWindow( windowMove, true );
if( isUsingPresentWindows() && !w->isOnAllDesktops() )
{
WindowMotionManager& manager = m_managers[ (w->desktop()-1)*(effects->numScreens()) + w->screen() ];
const QRectF transformedGeo = manager.transformedGeometry( w );
const QPointF pos = scalePos( transformedGeo.topLeft().toPoint(), w->desktop(), w->screen() );
const QSize size( scale[w->screen()] * (float)transformedGeo.width(),
scale[w->screen()] * (float)transformedGeo.height() );
m_windowMoveGeometry = QRect( pos.toPoint(), size );
m_windowMoveStartPoint = me->pos();
manager.unmanage( w );
m_proxy->calculateWindowTransformations( manager.managedWindows(), w->screen(), manager );
}
} }
} }
else if(( me->buttons() == Qt::MidButton || me->buttons() == Qt::RightButton ) && windowMove == NULL ) else if(( me->buttons() == Qt::MidButton || me->buttons() == Qt::RightButton ) && windowMove == NULL )
@ -553,15 +555,17 @@ void DesktopGridEffect::windowInputMouseEvent( Window, QEvent* e )
if( windowMove ) if( windowMove )
{ {
if( wasWindowMove ) if( wasWindowMove )
effects->activateWindow( windowMove ); // Just in case it was deactivated
effects->setElevatedWindow( windowMove, false );
if( isUsingPresentWindows() )
{ {
WindowMotionManager& manager = m_managers[ (windowMove->desktop()-1)*(effects->numScreens()) + windowMove->screen() ]; effects->activateWindow( windowMove ); // Just in case it was deactivated
manager.manage( windowMove ); if( isUsingPresentWindows() )
m_proxy->calculateWindowTransformations( manager.managedWindows(), windowMove->screen(), manager ); {
effects->addRepaintFull(); WindowMotionManager& manager = m_managers[ (windowMove->desktop()-1)*(effects->numScreens()) + windowMove->screen() ];
manager.manage( windowMove );
m_proxy->calculateWindowTransformations( manager.managedWindows(), windowMove->screen(), manager );
effects->addRepaintFull();
}
} }
effects->setElevatedWindow( windowMove, false );
windowMove = NULL; windowMove = NULL;
XDefineCursor( display(), input, QCursor( Qt::PointingHandCursor ).handle() ); XDefineCursor( display(), input, QCursor( Qt::PointingHandCursor ).handle() );
} }