diff options
| author | Pascal Junck <pjunck@openoffice.org> | 2004-10-22 11:13:38 +0000 |
|---|---|---|
| committer | Pascal Junck <pjunck@openoffice.org> | 2004-10-22 11:13:38 +0000 |
| commit | ed4c0dba18637a4ef9fddb14a29892d2b1d2d6d4 (patch) | |
| tree | 0a4d9b7bef626e4f795e67a889f20ecc5e6d3331 /vcl | |
| parent | 4cb8401a4429a0bf79a82bc336b57f38c26bb5a3 (diff) | |
INTEGRATION: CWS dba17 (1.13.104); FILE MERGED
2004/09/28 14:40:09 fs 1.13.104.3: #i34732# properly recalc top/left of maBtn2Rect - in case the orientation is switched while the control is alive
2004/09/20 14:50:14 fs 1.13.104.2: RESYNC: (1.13-1.14); FILE MERGED
2004/09/08 13:19:13 fs 1.13.104.1: #i33728# (approved by ssa) ImplCallEventListeners
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/control/scrbar.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index 08c7091381a7..0ee695446914 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -2,9 +2,9 @@ * * $RCSfile: scrbar.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: hr $ $Date: 2004-09-08 15:55:40 $ + * last change: $Author: pjunck $ $Date: 2004-10-22 12:13:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -397,6 +397,7 @@ void ScrollBar::ImplCalc( BOOL bUpdate ) else { aBtnSize = Size( aSize.Height(), aSize.Height() ); + maBtn2Rect.Top() = maBtn1Rect.Top(); maBtn2Rect.Left() = aSize.Width()-aSize.Height(); maBtn1Rect.SetSize( aBtnSize ); maBtn2Rect.SetSize( aBtnSize ); @@ -433,6 +434,7 @@ void ScrollBar::ImplCalc( BOOL bUpdate ) else { aBtnSize = Size( aSize.Width(), aSize.Width() ); + maBtn2Rect.Left() = maBtn1Rect.Left(); maBtn2Rect.Top() = aSize.Height()-aSize.Width(); maBtn1Rect.SetSize( aBtnSize ); maBtn2Rect.SetSize( aBtnSize ); @@ -1443,16 +1445,14 @@ long ScrollBar::PreNotify( NotifyEvent& rNEvt ) void ScrollBar::Scroll() { - ImplCallEventListeners( VCLEVENT_SCROLLBAR_SCROLL ); - maScrollHdl.Call( this ); + ImplCallEventListenersAndHandler( VCLEVENT_SCROLLBAR_SCROLL, maScrollHdl, this ); } // ----------------------------------------------------------------------- void ScrollBar::EndScroll() { - ImplCallEventListeners( VCLEVENT_SCROLLBAR_ENDSCROLL ); - maEndScrollHdl.Call( this ); + ImplCallEventListenersAndHandler( VCLEVENT_SCROLLBAR_ENDSCROLL, maEndScrollHdl, this ); } // ----------------------------------------------------------------------- |