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

Cancel a quick tile/maximize action if the user moves the window back

Browse source 
away from the edge of the screen without releasing the mouse button.

svn path=/trunk/KDE/kdebase/workspace/; revision=1031967
This commit is contained in:
Lucas Murray 2009-10-06 14:56:10 +00:00
parent 967720ecbe
commit d171c594ff
2 changed files with 38 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
geometry.cpp
View file

@ -3151,8 +3151,6 @@ void Client::handleMoveResize( int x, int y, int x_root, int y_root )
void Client::performMoveResize() void Client::performMoveResize()
{ {
if( isElectricBorderMaximizing() )
return;
#ifdef HAVE_XSYNC #ifdef HAVE_XSYNC
if( isResize() && options->resizeMode == Options::Opaque && if( isResize() && options->resizeMode == Options::Opaque &&
sync_counter != None && !sync_resize_pending ) sync_counter != None && !sync_resize_pending )

43
workspace.cpp
View file

@ -2193,9 +2193,12 @@ void Workspace::checkElectricBorder(const QPoint& pos, Time now)
{ {
bool enable = !movingClient->isElectricBorderMaximizing(); bool enable = !movingClient->isElectricBorderMaximizing();
movingClient->setElectricBorderMode( ElectricMaximizeMode ); movingClient->setElectricBorderMode( ElectricMaximizeMode );
movingClient->setElectricBorderMaximizing( enable ); movingClient->setElectricBorderMaximizing( true );
// stronger push back // Make electric windows thicker so we can detect when the user wants to cancel
pushback_pixels = 10; QRect r = Kephal::ScreenUtils::desktopGeometry();
XResizeWindow( display(), electric_windows[ElectricTop],
r.width() - 2, 20 );
return; // Don't reset cursor position
} }
if( options->electricBorderTiling() ) if( options->electricBorderTiling() )
{ {
@ -2205,17 +2208,24 @@ void Workspace::checkElectricBorder(const QPoint& pos, Time now)
{ {
movingClient->setElectricBorderMode( ElectricLeftMode ); movingClient->setElectricBorderMode( ElectricLeftMode );
activate = true; activate = true;
// Make electric windows thicker so we can detect when the user wants to cancel
QRect r = Kephal::ScreenUtils::desktopGeometry();
XResizeWindow( display(), electric_windows[ElectricLeft],
20, r.height() - 2 );
} }
else if( border == ElectricRight ) else if( border == ElectricRight )
{ {
movingClient->setElectricBorderMode( ElectricRightMode ); movingClient->setElectricBorderMode( ElectricRightMode );
activate = true; activate = true;
// Make electric windows thicker so we can detect when the user wants to cancel
QRect r = Kephal::ScreenUtils::desktopGeometry();
XMoveResizeWindow( display(), electric_windows[ElectricRight],
r.right() - 19, r.top() + 1, 20, r.height() - 2 );
} }
if( activate ) if( activate )
{ {
movingClient->setElectricBorderMaximizing( enable ); movingClient->setElectricBorderMaximizing( enable );
// stronger push back return; // Don't reset cursor position
pushback_pixels = 10;
} }
} }
else else
@ -2327,6 +2337,29 @@ bool Workspace::electricBorderEvent( XEvent* e )
{ {
if( e->type == EnterNotify ) if( e->type == EnterNotify )
{ {
if( movingClient && e->xcrossing.window == movingClient->moveResizeGrabWindow() )
{ // Cancel the quick tiling/maximization action when the user moves away from the edge.
// This event isn't from the border window; it came from the grab window.
movingClient->setElectricBorderMaximizing( false );
// Restore electric windows back to their normal size
QRect r = Kephal::ScreenUtils::desktopGeometry();
switch( movingClient->electricBorderMode() )
{
case ElectricMaximizeMode:
XResizeWindow( display(), electric_windows[ElectricTop],
r.width() - 2, 1 );
break;
case ElectricLeftMode:
XResizeWindow( display(), electric_windows[ElectricLeft],
1, r.height() - 2 );
break;
case ElectricRightMode:
XMoveResizeWindow( display(), electric_windows[ElectricRight],
r.right(), r.top() + 1, 1, r.height() - 2 );
break;
}
}
for( int i = 0; i < ELECTRIC_COUNT; ++i ) for( int i = 0; i < ELECTRIC_COUNT; ++i )
if( electric_windows[i] != None && e->xcrossing.window == electric_windows[i] ) if( electric_windows[i] != None && e->xcrossing.window == electric_windows[i] )
{ // The user entered an electric border { // The user entered an electric border