diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 08:07:44 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-03-30 08:07:44 +0000 |
| commit | d8a51d7e93ea8b4feb99a1b05d303d901dacfe58 (patch) | |
| tree | 194b0a37f262c94e0d3c2f756d38187bfc06b852 /vcl | |
| parent | 7eaf3b79eda9c4f82b0ac303308e8cd746b1b570 (diff) | |
INTEGRATION: CWS vcl38 (1.20.68); FILE MERGED
2005/03/14 14:52:54 ssa 1.20.68.1: #i43499# use CTRL to disable docking
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dockwin.cxx | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index 5e3b47a65b54..b4b950b92567 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -2,9 +2,9 @@ * * $RCSfile: dockwin.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: kz $ $Date: 2005-01-13 18:03:38 $ + * last change: $Author: rt $ $Date: 2005-03-30 09:07:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -196,7 +196,16 @@ IMPL_LINK( ImplDockFloatWin, DockTimerHdl, ImplDockFloatWin*, pWin ) maDockTimer.Stop(); PointerState aState = GetPointerState(); - if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) ) + + if( aState.mnState & KEY_MOD1 ) + { + // i43499 CTRL disables docking now + mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking(); + mpDockWin->EndDocking( maDockRect, TRUE ); + if( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) + maDockTimer.Start(); + } + else if( ! ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) ) { mpDockWin->GetParent()->ImplGetFrameWindow()->HideTracking(); mpDockWin->EndDocking( maDockRect, FALSE ); @@ -217,7 +226,8 @@ IMPL_LINK( ImplDockFloatWin, DockingHdl, ImplDockFloatWin*, pWindow ) mnLastUserEvent = 0; if( mpDockWin->IsDockable() && (Time::GetSystemTicks() - mnLastTicks > 500) && - ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) ) + ( aState.mnState & ( MOUSE_LEFT | MOUSE_MIDDLE | MOUSE_RIGHT ) ) && + !(aState.mnState & KEY_MOD1) ) // i43499 CTRL disables docking now { maDockPos = Point( mpDockWin->GetParent()->AbsoluteScreenToOutputPixel( OutputToAbsoluteScreenPixel( Point() ) ) ); maDockPos = mpDockWin->GetParent()->OutputToScreenPixel( maDockPos ); // sfx expects screen coordinates |