set (and reset) the right mouse cursor when resizing with Alt-RMB shortcuts
svn path=/trunk/kdebase/kwin/; revision=132928icc-effect-5.14.5
parent
379b214218
commit
1c3a77ac96
12
client.cpp
12
client.cpp
|
@ -585,7 +585,7 @@ void Client::startMoveResize()
|
||||||
{
|
{
|
||||||
moveResizeMode = true;
|
moveResizeMode = true;
|
||||||
workspace()->setClientIsMoving(this);
|
workspace()->setClientIsMoving(this);
|
||||||
grabMouse();
|
grabMouse( cursor() );
|
||||||
grabKeyboard();
|
grabKeyboard();
|
||||||
if ( ( isMove() && options->moveMode != Options::Opaque )
|
if ( ( isMove() && options->moveMode != Options::Opaque )
|
||||||
|| ( isResize() && options->resizeMode != Options::Opaque ) )
|
|| ( isResize() && options->resizeMode != Options::Opaque ) )
|
||||||
|
@ -1453,8 +1453,10 @@ void Client::mouseReleaseEvent( QMouseEvent * e)
|
||||||
buttonDown = FALSE;
|
buttonDown = FALSE;
|
||||||
if ( moveResizeMode ) {
|
if ( moveResizeMode ) {
|
||||||
clearbound();
|
clearbound();
|
||||||
stopMoveResize();
|
stopMoveResize();
|
||||||
setGeometry( geom );
|
setGeometry( geom );
|
||||||
|
mode = mousePosition( e->pos() );
|
||||||
|
setMouseCursor( mode );
|
||||||
Events::raise( isResize() ? Events::ResizeEnd : Events::MoveEnd );
|
Events::raise( isResize() ? Events::ResizeEnd : Events::MoveEnd );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1501,7 +1503,7 @@ void Client::mouseMoveEvent( QMouseEvent * e)
|
||||||
Events::raise( Events::UnMaximize );
|
Events::raise( Events::UnMaximize );
|
||||||
info->setState( 0, NET::Max );
|
info->setState( 0, NET::Max );
|
||||||
}
|
}
|
||||||
startMoveResize();
|
startMoveResize();
|
||||||
Events::raise( isResize() ? Events::ResizeStart : Events::MoveStart );
|
Events::raise( isResize() ? Events::ResizeStart : Events::MoveStart );
|
||||||
} else {
|
} else {
|
||||||
return;
|
return;
|
||||||
|
@ -2534,7 +2536,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
|
||||||
buttonDown = TRUE;
|
buttonDown = TRUE;
|
||||||
moveOffset = mapFromGlobal( globalPos );
|
moveOffset = mapFromGlobal( globalPos );
|
||||||
invertedMoveOffset = rect().bottomRight() - moveOffset;
|
invertedMoveOffset = rect().bottomRight() - moveOffset;
|
||||||
startMoveResize();
|
startMoveResize();
|
||||||
break;
|
break;
|
||||||
case Options::MouseResize: {
|
case Options::MouseResize: {
|
||||||
if (!isMovable())
|
if (!isMovable())
|
||||||
|
@ -2562,7 +2564,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
|
||||||
mode = (x < width() / 2) ? Left : Right;
|
mode = (x < width() / 2) ? Left : Right;
|
||||||
invertedMoveOffset = rect().bottomRight() - moveOffset;
|
invertedMoveOffset = rect().bottomRight() - moveOffset;
|
||||||
setMouseCursor( mode );
|
setMouseCursor( mode );
|
||||||
startMoveResize();
|
startMoveResize();
|
||||||
resizeHorizontalDirectionFixed = FALSE;
|
resizeHorizontalDirectionFixed = FALSE;
|
||||||
resizeVerticalDirectionFixed = FALSE;
|
resizeVerticalDirectionFixed = FALSE;
|
||||||
} break;
|
} break;
|
||||||
|
|
Loading…
Reference in New Issue