This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/AOO42X by this push:
new 03b0af109c Mainenance cleanup
03b0af109c is described below
commit 03b0af109ccdbb66c4244bcb1694b08b41332010
Author: mseidel <msei...@apache.org>
AuthorDate: Tue Dec 12 20:43:58 2023 +0100
Mainenance cleanup
(cherry picked from commit f85112c9f80c2da7fe21770423c3eda52ab5be71)
---
main/vcl/source/control/morebtn.cxx | 3 +-
main/vcl/source/control/spinbtn.cxx | 696 ++++++++++++++++++------------------
2 files changed, 348 insertions(+), 351 deletions(-)
diff --git a/main/vcl/source/control/morebtn.cxx
b/main/vcl/source/control/morebtn.cxx
index b247bed6c8..ccb2bbf852 100644
--- a/main/vcl/source/control/morebtn.cxx
+++ b/main/vcl/source/control/morebtn.cxx
@@ -19,8 +19,6 @@
*
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#include <vcl/morebtn.hxx>
@@ -270,3 +268,4 @@ XubString MoreButton::GetLessText() const
return PushButton::GetText();
}
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/vcl/source/control/spinbtn.cxx
b/main/vcl/source/control/spinbtn.cxx
index e2bafdfa77..75fa393445 100644
--- a/main/vcl/source/control/spinbtn.cxx
+++ b/main/vcl/source/control/spinbtn.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -7,20 +7,18 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-
-
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_vcl.hxx"
#include <tools/rcid.h>
@@ -32,48 +30,48 @@
void SpinButton::ImplInit( Window* pParent, WinBits nStyle )
{
- mbUpperIn = sal_False;
- mbLowerIn = sal_False;
- mbInitialUp = sal_False;
- mbInitialDown = sal_False;
+ mbUpperIn = sal_False;
+ mbLowerIn = sal_False;
+ mbInitialUp = sal_False;
+ mbInitialDown = sal_False;
- mnMinRange = 0;
- mnMaxRange = 100;
- mnValue = 0;
- mnValueStep = 1;
+ mnMinRange = 0;
+ mnMaxRange = 100;
+ mnValue = 0;
+ mnValueStep = 1;
- maRepeatTimer.SetTimeout(
GetSettings().GetMouseSettings().GetButtonStartRepeat() );
- maRepeatTimer.SetTimeoutHdl( LINK( this, SpinButton, ImplTimeout ) );
+ maRepeatTimer.SetTimeout(
GetSettings().GetMouseSettings().GetButtonStartRepeat() );
+ maRepeatTimer.SetTimeoutHdl( LINK( this, SpinButton, ImplTimeout ) );
- mbRepeat = 0 != ( nStyle & WB_REPEAT );
+ mbRepeat = 0 != ( nStyle & WB_REPEAT );
- if ( nStyle & WB_HSCROLL )
- mbHorz = sal_True;
- else
- mbHorz = sal_False;
+ if ( nStyle & WB_HSCROLL )
+ mbHorz = sal_True;
+ else
+ mbHorz = sal_False;
- Control::ImplInit( pParent, nStyle, NULL );
+ Control::ImplInit( pParent, nStyle, NULL );
}
// -----------------------------------------------------------------------
SpinButton::SpinButton( Window* pParent, WinBits nStyle )
- :Control( WINDOW_SPINBUTTON )
- ,mbUpperIsFocused( sal_False )
+ :Control( WINDOW_SPINBUTTON )
+ ,mbUpperIsFocused( sal_False )
{
- ImplInit( pParent, nStyle );
+ ImplInit( pParent, nStyle );
}
// -----------------------------------------------------------------------
SpinButton::SpinButton( Window* pParent, const ResId& rResId )
- :Control( WINDOW_SPINBUTTON )
- ,mbUpperIsFocused( sal_False )
+ :Control( WINDOW_SPINBUTTON )
+ ,mbUpperIsFocused( sal_False )
{
- rResId.SetRT( RSC_SPINBUTTON );
- ImplInit( pParent, ImplInitRes( rResId ) );
- ImplLoadRes( rResId );
- Resize();
+ rResId.SetRT( RSC_SPINBUTTON );
+ ImplInit( pParent, ImplInitRes( rResId ) );
+ ImplLoadRes( rResId );
+ Resize();
}
// -----------------------------------------------------------------------
@@ -86,87 +84,87 @@ SpinButton::~SpinButton()
IMPL_LINK( SpinButton, ImplTimeout, Timer*, pTimer )
{
- if ( pTimer->GetTimeout() ==
GetSettings().GetMouseSettings().GetButtonStartRepeat() )
- {
- pTimer->SetTimeout( GetSettings().GetMouseSettings().GetButtonRepeat()
);
- pTimer->Start();
- }
- else
- {
- if ( mbInitialUp )
- Up();
- else
- Down();
- }
-
- return 0;
+ if ( pTimer->GetTimeout() ==
GetSettings().GetMouseSettings().GetButtonStartRepeat() )
+ {
+ pTimer->SetTimeout(
GetSettings().GetMouseSettings().GetButtonRepeat() );
+ pTimer->Start();
+ }
+ else
+ {
+ if ( mbInitialUp )
+ Up();
+ else
+ Down();
+ }
+
+ return 0;
}
// -----------------------------------------------------------------------
void SpinButton::Up()
{
- if ( ImplIsUpperEnabled() )
- {
- mnValue += mnValueStep;
- StateChanged( STATE_CHANGE_DATA );
+ if ( ImplIsUpperEnabled() )
+ {
+ mnValue += mnValueStep;
+ StateChanged( STATE_CHANGE_DATA );
- ImplMoveFocus( sal_True );
- }
+ ImplMoveFocus( sal_True );
+ }
- ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_UP, maUpHdlLink,
this );
+ ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_UP, maUpHdlLink,
this );
}
// -----------------------------------------------------------------------
void SpinButton::Down()
{
- if ( ImplIsLowerEnabled() )
- {
- mnValue -= mnValueStep;
- StateChanged( STATE_CHANGE_DATA );
+ if ( ImplIsLowerEnabled() )
+ {
+ mnValue -= mnValueStep;
+ StateChanged( STATE_CHANGE_DATA );
- ImplMoveFocus( sal_False );
- }
+ ImplMoveFocus( sal_False );
+ }
- ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_DOWN, maDownHdlLink,
this );
+ ImplCallEventListenersAndHandler( VCLEVENT_SPINBUTTON_DOWN,
maDownHdlLink, this );
}
// -----------------------------------------------------------------------
void SpinButton::Resize()
{
- Control::Resize();
+ Control::Resize();
- Size aSize( GetOutputSizePixel() );
+ Size aSize( GetOutputSizePixel() );
Point aTmpPoint;
- Rectangle aRect( aTmpPoint, aSize );
- if ( mbHorz )
- {
- maLowerRect = Rectangle( 0, 0, aSize.Width()/2, aSize.Height()-1 );
- maUpperRect = Rectangle( maLowerRect.TopRight(), aRect.BottomRight() );
- }
- else
- {
- maUpperRect = Rectangle( 0, 0, aSize.Width()-1, aSize.Height()/2 );
- maLowerRect = Rectangle( maUpperRect.BottomLeft(), aRect.BottomRight()
);
- }
-
- ImplCalcFocusRect( ImplIsUpperEnabled() || !ImplIsLowerEnabled() );
-
- Invalidate();
+ Rectangle aRect( aTmpPoint, aSize );
+ if ( mbHorz )
+ {
+ maLowerRect = Rectangle( 0, 0, aSize.Width() / 2,
aSize.Height() - 1 );
+ maUpperRect = Rectangle( maLowerRect.TopRight(),
aRect.BottomRight() );
+ }
+ else
+ {
+ maUpperRect = Rectangle( 0, 0, aSize.Width() - 1,
aSize.Height() / 2 );
+ maLowerRect = Rectangle( maUpperRect.BottomLeft(),
aRect.BottomRight() );
+ }
+
+ ImplCalcFocusRect( ImplIsUpperEnabled() || !ImplIsLowerEnabled() );
+
+ Invalidate();
}
// -----------------------------------------------------------------------
void SpinButton::Draw( OutputDevice* pDev, const Point& rPos, const Size&
rSize, sal_uLong nFlags )
{
- Point aPos = pDev->LogicToPixel( rPos );
- Size aSize = pDev->LogicToPixel( rSize );
-
- pDev->Push();
- pDev->SetMapMode();
- if ( !(nFlags & WINDOW_DRAW_MONO) )
+ Point aPos = pDev->LogicToPixel( rPos );
+ Size aSize = pDev->LogicToPixel( rSize );
+
+ pDev->Push();
+ pDev->SetMapMode();
+ if ( !(nFlags & WINDOW_DRAW_MONO) )
{
// DecoView uses the FaceColor...
AllSettings aSettings = pDev->GetSettings();
@@ -180,367 +178,367 @@ void SpinButton::Draw( OutputDevice* pDev, const Point&
rPos, const Size& rSize,
pDev->SetSettings( aSettings );
}
- Rectangle aRect( Point( 0, 0 ), aSize );
- Rectangle aLowerRect, aUpperRect;
- if ( mbHorz )
- {
- aLowerRect = Rectangle( 0, 0, aSize.Width()/2, aSize.Height()-1 );
- aUpperRect = Rectangle( aLowerRect.TopRight(), aRect.BottomRight() );
- }
- else
- {
- aUpperRect = Rectangle( 0, 0, aSize.Width()-1, aSize.Height()/2 );
- aLowerRect = Rectangle( aUpperRect.BottomLeft(), aRect.BottomRight() );
- }
-
- aUpperRect += aPos;
- aLowerRect += aPos;
-
- ImplDrawSpinButton( pDev, aUpperRect, aLowerRect, sal_False, sal_False,
- IsEnabled() && ImplIsUpperEnabled(),
- IsEnabled() && ImplIsLowerEnabled(), mbHorz, sal_True
);
- pDev->Pop();
+ Rectangle aRect( Point( 0, 0 ), aSize );
+ Rectangle aLowerRect, aUpperRect;
+ if ( mbHorz )
+ {
+ aLowerRect = Rectangle( 0, 0, aSize.Width() / 2, aSize.Height()
- 1 );
+ aUpperRect = Rectangle( aLowerRect.TopRight(),
aRect.BottomRight() );
+ }
+ else
+ {
+ aUpperRect = Rectangle( 0, 0, aSize.Width() - 1, aSize.Height()
/ 2 );
+ aLowerRect = Rectangle( aUpperRect.BottomLeft(),
aRect.BottomRight() );
+ }
+
+ aUpperRect += aPos;
+ aLowerRect += aPos;
+
+ ImplDrawSpinButton( pDev, aUpperRect, aLowerRect, sal_False, sal_False,
+ IsEnabled() &&
ImplIsUpperEnabled(),
+ IsEnabled() &&
ImplIsLowerEnabled(), mbHorz, sal_True );
+ pDev->Pop();
}
void SpinButton::Paint( const Rectangle& )
{
- HideFocus();
+ HideFocus();
- sal_Bool bEnable = IsEnabled();
- ImplDrawSpinButton( this, maUpperRect, maLowerRect, mbUpperIn, mbLowerIn,
- bEnable && ImplIsUpperEnabled(),
- bEnable && ImplIsLowerEnabled(), mbHorz, sal_True );
+ sal_Bool bEnable = IsEnabled();
+ ImplDrawSpinButton( this, maUpperRect, maLowerRect, mbUpperIn,
mbLowerIn,
+ bEnable && ImplIsUpperEnabled(),
+ bEnable &&
ImplIsLowerEnabled(), mbHorz, sal_True );
- if ( HasFocus() )
- ShowFocus( maFocusRect );
+ if ( HasFocus() )
+ ShowFocus( maFocusRect );
}
// -----------------------------------------------------------------------
void SpinButton::MouseButtonDown( const MouseEvent& rMEvt )
{
- if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) && ( ImplIsUpperEnabled()
) )
- {
- mbUpperIn = sal_True;
- mbInitialUp = sal_True;
- Invalidate( maUpperRect );
- }
- else if ( maLowerRect.IsInside( rMEvt.GetPosPixel() ) && (
ImplIsLowerEnabled() ) )
- {
- mbLowerIn = sal_True;
- mbInitialDown = sal_True;
- Invalidate( maLowerRect );
- }
-
- if ( mbUpperIn || mbLowerIn )
- {
- Update();
- CaptureMouse();
- if ( mbRepeat )
- maRepeatTimer.Start();
- }
+ if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) && (
ImplIsUpperEnabled() ) )
+ {
+ mbUpperIn = sal_True;
+ mbInitialUp = sal_True;
+ Invalidate( maUpperRect );
+ }
+ else if ( maLowerRect.IsInside( rMEvt.GetPosPixel() ) && (
ImplIsLowerEnabled() ) )
+ {
+ mbLowerIn = sal_True;
+ mbInitialDown = sal_True;
+ Invalidate( maLowerRect );
+ }
+
+ if ( mbUpperIn || mbLowerIn )
+ {
+ Update();
+ CaptureMouse();
+ if ( mbRepeat )
+ maRepeatTimer.Start();
+ }
}
// -----------------------------------------------------------------------
void SpinButton::MouseButtonUp( const MouseEvent& )
{
- ReleaseMouse();
- if ( mbRepeat )
- {
- maRepeatTimer.Stop();
-
maRepeatTimer.SetTimeout(GetSettings().GetMouseSettings().GetButtonStartRepeat()
);
- }
-
- if ( mbUpperIn )
- {
- mbUpperIn = sal_False;
- Invalidate( maUpperRect );
- Update();
- Up();
- }
- else if ( mbLowerIn )
- {
- mbLowerIn = sal_False;
- Invalidate( maLowerRect );
- Update();
- Down();
- }
-
- mbInitialUp = mbInitialDown = sal_False;
+ ReleaseMouse();
+ if ( mbRepeat )
+ {
+ maRepeatTimer.Stop();
+
maRepeatTimer.SetTimeout(GetSettings().GetMouseSettings().GetButtonStartRepeat()
);
+ }
+
+ if ( mbUpperIn )
+ {
+ mbUpperIn = sal_False;
+ Invalidate( maUpperRect );
+ Update();
+ Up();
+ }
+ else if ( mbLowerIn )
+ {
+ mbLowerIn = sal_False;
+ Invalidate( maLowerRect );
+ Update();
+ Down();
+ }
+
+ mbInitialUp = mbInitialDown = sal_False;
}
// -----------------------------------------------------------------------
void SpinButton::MouseMove( const MouseEvent& rMEvt )
{
- if ( !rMEvt.IsLeft() || (!mbInitialUp && !mbInitialDown) )
- return;
-
- if ( !maUpperRect.IsInside( rMEvt.GetPosPixel() ) &&
- mbUpperIn && mbInitialUp )
- {
- mbUpperIn = sal_False;
- maRepeatTimer.Stop();
- Invalidate( maUpperRect );
- Update();
- }
- else if ( !maLowerRect.IsInside( rMEvt.GetPosPixel() ) &&
- mbLowerIn & mbInitialDown )
- {
- mbLowerIn = sal_False;
- maRepeatTimer.Stop();
- Invalidate( maLowerRect );
- Update();
- }
- else if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) &&
- !mbUpperIn && mbInitialUp )
- {
- mbUpperIn = sal_True;
- if ( mbRepeat )
- maRepeatTimer.Start();
- Invalidate( maUpperRect );
- Update();
- }
- else if ( maLowerRect.IsInside( rMEvt.GetPosPixel() ) &&
- !mbLowerIn && mbInitialDown )
- {
- mbLowerIn = sal_True;
- if ( mbRepeat )
- maRepeatTimer.Start();
- Invalidate( maLowerRect );
- Update();
- }
+ if ( !rMEvt.IsLeft() || (!mbInitialUp && !mbInitialDown) )
+ return;
+
+ if ( !maUpperRect.IsInside( rMEvt.GetPosPixel() ) &&
+ mbUpperIn && mbInitialUp )
+ {
+ mbUpperIn = sal_False;
+ maRepeatTimer.Stop();
+ Invalidate( maUpperRect );
+ Update();
+ }
+ else if ( !maLowerRect.IsInside( rMEvt.GetPosPixel() ) &&
+ mbLowerIn & mbInitialDown )
+ {
+ mbLowerIn = sal_False;
+ maRepeatTimer.Stop();
+ Invalidate( maLowerRect );
+ Update();
+ }
+ else if ( maUpperRect.IsInside( rMEvt.GetPosPixel() ) &&
+ !mbUpperIn && mbInitialUp )
+ {
+ mbUpperIn = sal_True;
+ if ( mbRepeat )
+ maRepeatTimer.Start();
+ Invalidate( maUpperRect );
+ Update();
+ }
+ else if ( maLowerRect.IsInside( rMEvt.GetPosPixel() ) &&
+ !mbLowerIn && mbInitialDown )
+ {
+ mbLowerIn = sal_True;
+ if ( mbRepeat )
+ maRepeatTimer.Start();
+ Invalidate( maLowerRect );
+ Update();
+ }
}
// -----------------------------------------------------------------------
void SpinButton::KeyInput( const KeyEvent& rKEvt )
{
- KeyCode aCode = rKEvt.GetKeyCode();
-
- if ( !rKEvt.GetKeyCode().GetModifier() )
- {
- switch ( rKEvt.GetKeyCode().GetCode() )
- {
- case KEY_LEFT:
- case KEY_RIGHT:
- {
- sal_Bool bUp = KEY_RIGHT == rKEvt.GetKeyCode().GetCode();
- if ( mbHorz && !ImplMoveFocus( bUp ) )
- bUp ? Up() : Down();
- }
- break;
-
- case KEY_UP:
- case KEY_DOWN:
- {
- sal_Bool bUp = KEY_UP == rKEvt.GetKeyCode().GetCode();
- if ( !mbHorz && !ImplMoveFocus( KEY_UP ==
rKEvt.GetKeyCode().GetCode() ) )
- bUp ? Up() : Down();
- }
- break;
-
- case KEY_SPACE:
- mbUpperIsFocused ? Up() : Down();
- break;
-
- default:
- Control::KeyInput( rKEvt );
- break;
- }
- }
- else
- Control::KeyInput( rKEvt );
+ KeyCode aCode = rKEvt.GetKeyCode();
+
+ if ( !rKEvt.GetKeyCode().GetModifier() )
+ {
+ switch ( rKEvt.GetKeyCode().GetCode() )
+ {
+ case KEY_LEFT:
+ case KEY_RIGHT:
+ {
+ sal_Bool bUp = KEY_RIGHT ==
rKEvt.GetKeyCode().GetCode();
+ if ( mbHorz && !ImplMoveFocus( bUp ) )
+ bUp ? Up() : Down();
+ }
+ break;
+
+ case KEY_UP:
+ case KEY_DOWN:
+ {
+ sal_Bool bUp = KEY_UP == rKEvt.GetKeyCode().GetCode();
+ if ( !mbHorz && !ImplMoveFocus( KEY_UP ==
rKEvt.GetKeyCode().GetCode() ) )
+ bUp ? Up() : Down();
+ }
+ break;
+
+ case KEY_SPACE:
+ mbUpperIsFocused ? Up() : Down();
+ break;
+
+ default:
+ Control::KeyInput( rKEvt );
+ break;
+ }
+ }
+ else
+ Control::KeyInput( rKEvt );
}
// -----------------------------------------------------------------------
void SpinButton::StateChanged( StateChangedType nType )
{
- switch ( nType )
- {
- case STATE_CHANGE_DATA:
- case STATE_CHANGE_ENABLE:
- Invalidate();
- break;
-
- case STATE_CHANGE_STYLE:
- {
- sal_Bool bNewRepeat = 0 != ( GetStyle() & WB_REPEAT );
- if ( bNewRepeat != mbRepeat )
- {
- if ( maRepeatTimer.IsActive() )
- {
- maRepeatTimer.Stop();
- maRepeatTimer.SetTimeout(
GetSettings().GetMouseSettings().GetButtonStartRepeat() );
- }
- mbRepeat = bNewRepeat;
- }
-
- sal_Bool bNewHorz = 0 != ( GetStyle() & WB_HSCROLL );
- if ( bNewHorz != mbHorz )
- {
- mbHorz = bNewHorz;
- Resize();
- }
- }
- break;
- }
-
- Control::StateChanged( nType );
+ switch ( nType )
+ {
+ case STATE_CHANGE_DATA:
+ case STATE_CHANGE_ENABLE:
+ Invalidate();
+ break;
+
+ case STATE_CHANGE_STYLE:
+ {
+ sal_Bool bNewRepeat = 0 != ( GetStyle() & WB_REPEAT );
+ if ( bNewRepeat != mbRepeat )
+ {
+ if ( maRepeatTimer.IsActive() )
+ {
+ maRepeatTimer.Stop();
+ maRepeatTimer.SetTimeout(
GetSettings().GetMouseSettings().GetButtonStartRepeat() );
+ }
+ mbRepeat = bNewRepeat;
+ }
+
+ sal_Bool bNewHorz = 0 != ( GetStyle() & WB_HSCROLL );
+ if ( bNewHorz != mbHorz )
+ {
+ mbHorz = bNewHorz;
+ Resize();
+ }
+ }
+ break;
+ }
+
+ Control::StateChanged( nType );
}
// -----------------------------------------------------------------------
void SpinButton::SetRangeMin( long nNewRange )
{
- SetRange( Range( nNewRange, GetRangeMax() ) );
+ SetRange( Range( nNewRange, GetRangeMax() ) );
}
// -----------------------------------------------------------------------
void SpinButton::SetRangeMax( long nNewRange )
{
- SetRange( Range( GetRangeMin(), nNewRange ) );
+ SetRange( Range( GetRangeMin(), nNewRange ) );
}
// -----------------------------------------------------------------------
void SpinButton::SetRange( const Range& rRange )
{
- // adjust rage
- Range aRange = rRange;
- aRange.Justify();
- long nNewMinRange = aRange.Min();
- long nNewMaxRange = aRange.Max();
-
- // do something only if old and new range differ
- if ( (mnMinRange != nNewMinRange) ||
- (mnMaxRange != nNewMaxRange) )
- {
- mnMinRange = nNewMinRange;
- mnMaxRange = nNewMaxRange;
-
- // adjust value to new range, if necessary
- if ( mnValue > mnMaxRange )
- mnValue = mnMaxRange;
- if ( mnValue < mnMinRange )
- mnValue = mnMinRange;
-
- StateChanged( STATE_CHANGE_DATA );
- }
+ // adjust range
+ Range aRange = rRange;
+ aRange.Justify();
+ long nNewMinRange = aRange.Min();
+ long nNewMaxRange = aRange.Max();
+
+ // do something only if old and new range differ
+ if ( (mnMinRange != nNewMinRange) ||
+ (mnMaxRange != nNewMaxRange) )
+ {
+ mnMinRange = nNewMinRange;
+ mnMaxRange = nNewMaxRange;
+
+ // adjust value to new range, if necessary
+ if ( mnValue > mnMaxRange )
+ mnValue = mnMaxRange;
+ if ( mnValue < mnMinRange )
+ mnValue = mnMinRange;
+
+ StateChanged( STATE_CHANGE_DATA );
+ }
}
// -----------------------------------------------------------------------
void SpinButton::SetValue( long nValue )
{
- // adjust, if necessary
- if ( nValue > mnMaxRange )
- nValue = mnMaxRange;
- if ( nValue < mnMinRange )
- nValue = mnMinRange;
-
- if ( mnValue != nValue )
- {
- mnValue = nValue;
- StateChanged( STATE_CHANGE_DATA );
- }
+ // adjust, if necessary
+ if ( nValue > mnMaxRange )
+ nValue = mnMaxRange;
+ if ( nValue < mnMinRange )
+ nValue = mnMinRange;
+
+ if ( mnValue != nValue )
+ {
+ mnValue = nValue;
+ StateChanged( STATE_CHANGE_DATA );
+ }
}
// -----------------------------------------------------------------------
void SpinButton::GetFocus()
{
- ShowFocus( maFocusRect );
- Control::GetFocus();
+ ShowFocus( maFocusRect );
+ Control::GetFocus();
}
// -----------------------------------------------------------------------
void SpinButton::LoseFocus()
{
- HideFocus();
- Control::LoseFocus();
+ HideFocus();
+ Control::LoseFocus();
}
// -----------------------------------------------------------------------
sal_Bool SpinButton::ImplMoveFocus( sal_Bool _bUpper )
{
- if ( _bUpper == mbUpperIsFocused )
- return sal_False;
-
- HideFocus();
- ImplCalcFocusRect( _bUpper );
- if ( HasFocus() )
- ShowFocus( maFocusRect );
- return sal_True;
+ if ( _bUpper == mbUpperIsFocused )
+ return sal_False;
+
+ HideFocus();
+ ImplCalcFocusRect( _bUpper );
+ if ( HasFocus() )
+ ShowFocus( maFocusRect );
+ return sal_True;
}
// -----------------------------------------------------------------------
void SpinButton::ImplCalcFocusRect( sal_Bool _bUpper )
{
- maFocusRect = _bUpper ? maUpperRect : maLowerRect;
- // inflate by some pixels
- maFocusRect.Left() += 2;
- maFocusRect.Top() += 2;
- maFocusRect.Right() -= 2;
- maFocusRect.Bottom() -= 2;
- mbUpperIsFocused = _bUpper;
+ maFocusRect = _bUpper ? maUpperRect : maLowerRect;
+ // inflate by some pixels
+ maFocusRect.Left() += 2;
+ maFocusRect.Top() += 2;
+ maFocusRect.Right() -= 2;
+ maFocusRect.Bottom() -= 2;
+ mbUpperIsFocused = _bUpper;
}
// -----------------------------------------------------------------------
Rectangle* SpinButton::ImplFindPartRect( const Point& rPt )
{
- if( maUpperRect.IsInside( rPt ) )
- return &maUpperRect;
- else if( maLowerRect.IsInside( rPt ) )
- return &maLowerRect;
- else
- return NULL;
+ if( maUpperRect.IsInside( rPt ) )
+ return &maUpperRect;
+ else if( maLowerRect.IsInside( rPt ) )
+ return &maLowerRect;
+ else
+ return NULL;
}
long SpinButton::PreNotify( NotifyEvent& rNEvt )
{
- long nDone = 0;
- const MouseEvent* pMouseEvt = NULL;
-
- if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt =
rNEvt.GetMouseEvent()) != NULL )
- {
- if( !pMouseEvt->GetButtons() && !pMouseEvt->IsSynthetic() &&
!pMouseEvt->IsModifierChanged() )
- {
- // trigger redraw if mouse over state has changed
- if( IsNativeControlSupported(CTRL_SPINBOX, PART_ENTIRE_CONTROL) ||
- IsNativeControlSupported(CTRL_SPINBOX, PART_ALL_BUTTONS) )
- {
- Rectangle* pRect = ImplFindPartRect( GetPointerPosPixel() );
- Rectangle* pLastRect = ImplFindPartRect(
GetLastPointerPosPixel() );
- if( pRect != pLastRect || (pMouseEvt->IsLeaveWindow() ||
pMouseEvt->IsEnterWindow()) )
- {
- Region aRgn( GetActiveClipRegion() );
- if( pLastRect )
- {
- SetClipRegion( *pLastRect );
- Paint( *pLastRect );
- SetClipRegion( aRgn );
- }
- if( pRect )
- {
- SetClipRegion( *pRect );
- Paint( *pRect );
- SetClipRegion( aRgn );
- }
- }
- }
- }
- }
-
- return nDone ? nDone : Control::PreNotify(rNEvt);
+ long nDone = 0;
+ const MouseEvent* pMouseEvt = NULL;
+
+ if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt =
rNEvt.GetMouseEvent()) != NULL )
+ {
+ if( !pMouseEvt->GetButtons() && !pMouseEvt->IsSynthetic() &&
!pMouseEvt->IsModifierChanged() )
+ {
+ // trigger redraw if mouse over state has changed
+ if( IsNativeControlSupported(CTRL_SPINBOX,
PART_ENTIRE_CONTROL) ||
+ IsNativeControlSupported(CTRL_SPINBOX,
PART_ALL_BUTTONS) )
+ {
+ Rectangle* pRect = ImplFindPartRect(
GetPointerPosPixel() );
+ Rectangle* pLastRect = ImplFindPartRect(
GetLastPointerPosPixel() );
+ if( pRect != pLastRect ||
(pMouseEvt->IsLeaveWindow() || pMouseEvt->IsEnterWindow()) )
+ {
+ Region aRgn( GetActiveClipRegion() );
+ if( pLastRect )
+ {
+ SetClipRegion( *pLastRect );
+ Paint( *pLastRect );
+ SetClipRegion( aRgn );
+ }
+ if( pRect )
+ {
+ SetClipRegion( *pRect );
+ Paint( *pRect );
+ SetClipRegion( aRgn );
+ }
+ }
+ }
+ }
+ }
+
+ return nDone ? nDone : Control::PreNotify(rNEvt);
}
-// -----------------------------------------------------------------------
+/* vim: set noet sw=4 ts=4: */
