diff options
-rw-r--r-- | include/vcl/toolbox.hxx | 3 | ||||
-rw-r--r-- | vcl/source/window/toolbox.cxx | 13 |
2 files changed, 8 insertions, 8 deletions
diff --git a/include/vcl/toolbox.hxx b/include/vcl/toolbox.hxx index 12a0b7029f9b..11958cd1f7e0 100644 --- a/include/vcl/toolbox.hxx +++ b/include/vcl/toolbox.hxx @@ -155,7 +155,8 @@ public: using Window::ImplInit; private: SAL_DLLPRIVATE void InvalidateItem(sal_uInt16 nPosition); - SAL_DLLPRIVATE void InvalidateSpin(bool bUpperIn, bool bLowerIn); + SAL_DLLPRIVATE void InvalidateSpin(bool bInvalidateUpper = true, + bool bInvalidateLower = true); SAL_DLLPRIVATE void InvalidateMenuButton(); SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index e0e84920a33f..62140e435128 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -3455,8 +3455,7 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) if ( bNewIn != mbIn ) { mbIn = bNewIn; - Invalidate(); - InvalidateSpin(mbIn, false); + InvalidateSpin(true, false); } return true; } @@ -3467,7 +3466,7 @@ bool ToolBox::ImplHandleMouseMove( const MouseEvent& rMEvt, bool bRepeat ) if ( bNewIn != mbIn ) { mbIn = bNewIn; - InvalidateSpin(false, mbIn); + InvalidateSpin(false, true); } return true; } @@ -3582,7 +3581,7 @@ bool ToolBox::ImplHandleMouseButtonUp( const MouseEvent& rMEvt, bool bCancel ) mbUpper = false; mbLower = false; mbIn = false; - InvalidateSpin(false, false); + InvalidateSpin(); return true; } @@ -4484,7 +4483,7 @@ void ToolBox::Command( const CommandEvent& rCEvt ) ShowLine( false ); else if ( (mnCurLine+mnVisLines-1 < mnCurLines) && (pData->GetDelta() < 0) ) ShowLine( true ); - InvalidateSpin(false, false); + InvalidateSpin(); return; } } @@ -5193,7 +5192,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) mnCurLine = 1; mbFormat = true; ImplFormat(); - InvalidateSpin(false, false); + InvalidateSpin(); ImplChangeHighlight( ImplGetFirstValidItem( mnCurLine ) ); } break; @@ -5206,7 +5205,7 @@ void ToolBox::KeyInput( const KeyEvent& rKEvt ) mnCurLine = mnCurLines; mbFormat = true; ImplFormat(); - InvalidateSpin(false, false); + InvalidateSpin(); ImplChangeHighlight( ImplGetFirstValidItem( mnCurLine ) ); } break; |