Fix for #54495 in HEAD too.
svn path=/trunk/kdebase/kwin/; revision=231991
This commit is contained in:
parent
6dc2810d6a
commit
caf31eb936
1 changed files with 5 additions and 3 deletions
|
@ -1761,7 +1761,9 @@ void Client::mouseMoveEvent( QMouseEvent * e)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( !isMovable() || (isShade() && mode != Center)) return;
|
if(( mode == Center && !isMovable())
|
||||||
|
|| ( mode != Center && ( isShade() || !isResizable())))
|
||||||
|
return;
|
||||||
|
|
||||||
if ( !moveResizeMode ) {
|
if ( !moveResizeMode ) {
|
||||||
QPoint p( e->pos() - moveOffset );
|
QPoint p( e->pos() - moveOffset );
|
||||||
|
@ -2897,7 +2899,7 @@ bool Client::performMouseCommand( Options::MouseCommand command, QPoint globalPo
|
||||||
startMoveResize();
|
startMoveResize();
|
||||||
break;
|
break;
|
||||||
case Options::MouseResize: {
|
case Options::MouseResize: {
|
||||||
if (!isMovable())
|
if (!isResizable() || isShade())
|
||||||
break;
|
break;
|
||||||
geom=geometry();
|
geom=geometry();
|
||||||
if ( isMaximized() ) {
|
if ( isMaximized() ) {
|
||||||
|
@ -2941,7 +2943,7 @@ void Client::NETMoveResize( int x_root, int y_root, NET::Direction direction )
|
||||||
else if( direction >= NET::TopLeft && direction <= NET::Left ) {
|
else if( direction >= NET::TopLeft && direction <= NET::Left ) {
|
||||||
static const MousePosition convert[] = { TopLeft, Top, TopRight, Right, BottomRight, Bottom,
|
static const MousePosition convert[] = { TopLeft, Top, TopRight, Right, BottomRight, Bottom,
|
||||||
BottomLeft, Left };
|
BottomLeft, Left };
|
||||||
if (!isMovable())
|
if(!isResizable() || isShade())
|
||||||
return;
|
return;
|
||||||
geom=geometry();
|
geom=geometry();
|
||||||
if ( isMaximized() ) {
|
if ( isMaximized() ) {
|
||||||
|
|
Loading…
Reference in a new issue