Kaydet (Commit) 6f17d2bc authored tarafından Jan Holesovsky's avatar Jan Holesovsky

fdo#70160: Revert "Sidebar: Correcting anomalous mouse behaviour while resizing"

Let's revert this for the time being, before we have the full solution that
works both for sidebars, as well as for the normal docked windows.

This reverts commit 16ea2dc1.
üst 7235d232
...@@ -2542,30 +2542,21 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt ) ...@@ -2542,30 +2542,21 @@ void SplitWindow::Tracking( const TrackingEvent& rTEvt )
{ {
sal_Bool bPropSmaller = (mnMouseModifier & KEY_SHIFT) ? sal_True : sal_False; sal_Bool bPropSmaller = (mnMouseModifier & KEY_SHIFT) ? sal_True : sal_False;
sal_Bool bPropGreater = (mnMouseModifier & KEY_MOD1) ? sal_True : sal_False; sal_Bool bPropGreater = (mnMouseModifier & KEY_MOD1) ? sal_True : sal_False;
long nDelta = mnMSplitPos-mnMStartPos;
if ( (mnSplitTest & SPLIT_WINDOW) && !mpMainSet->mpItems ) if ( (mnSplitTest & SPLIT_WINDOW) && !mpMainSet->mpItems )
{ {
// nDelta corresponds to the direction to which user drags the mouse.
// If nDelta > 0, means user has dragged the handle towards the right and vice-versa
long nDelta = mnMSplitPos-mnMStartPos;
if ( (mpSplitSet == mpMainSet) && mbBottomRight ) if ( (mpSplitSet == mpMainSet) && mbBottomRight )
nDelta *= -1; nDelta *= -1;
ImplSetWindowSize( nDelta ); ImplSetWindowSize( nDelta );
} }
else else
{ {
long nNewSize( 0 ); long nNewSize = mpSplitSet->mpItems[mnSplitPos].mnPixSize;
// where is the sidebar is attached?
if ( (mpSplitSet == mpMainSet) && mbBottomRight ) if ( (mpSplitSet == mpMainSet) && mbBottomRight )
nNewSize = mnMaxSize - mnMStartPos; // right hand side of the screen nNewSize -= nDelta;
else else
nNewSize = mnMStartPos; // left hand side of the screen nNewSize += nDelta;
// do not make the sidebar wider than mnMaxSize
nNewSize = std::min(nNewSize, mpSplitSet->mpItems[mnSplitPos].mnMaxSize);
SplitItem( mpSplitSet->mpItems[mnSplitPos].mnId, nNewSize, SplitItem( mpSplitSet->mpItems[mnSplitPos].mnId, nNewSize,
bPropSmaller, bPropGreater ); bPropSmaller, bPropGreater );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment