diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-02-20 16:51:17 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-02-24 12:24:47 +0100 |
| commit | 8ccb70131e67d9badcef25044fec4026120f9590 (patch) | |
| tree | 9e564fb7481c95c78c0fcad9def7d7ede11a7d66 /svtools | |
| parent | f32cfbc05eec644e2f37aac38410ad3f8c944ef5 (diff) | |
Resolves: tdf#97731 allow status bar to adapt to its own preferred size
Change-Id: I4390f61a21eef21371ce7399bf746e60234b8db8
(cherry picked from commit 917d5b8b26a7428f7b7dd495a8db14a3ce16aa55)
Reviewed-on: https://gerrit.libreoffice.org/34484
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit 95eff15aa6e02ab875bd898f6be4f23343ba6b9b)
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/brwbox/brwbox1.cxx | 10 | ||||
| -rw-r--r-- | svtools/source/brwbox/editbrowsebox.cxx | 14 |
2 files changed, 14 insertions, 10 deletions
diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index 8a7b1fac54a7..bd6b16b2305c 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -2091,19 +2091,18 @@ sal_uInt16 BrowseBox::GetColumnAtXPosPixel( long nX, bool ) const return BROWSER_INVALIDID; } - -void BrowseBox::ReserveControlArea( sal_uInt16 nWidth ) +bool BrowseBox::ReserveControlArea(sal_uInt16 nWidth) { - - if ( nWidth != nControlAreaWidth ) + if (nWidth != nControlAreaWidth) { OSL_ENSURE(nWidth,"Control area of 0 is not allowed, Use USHRT_MAX instead!"); nControlAreaWidth = nWidth; UpdateScrollbars(); + return true; } + return false; } - Rectangle BrowseBox::GetControlArea() const { @@ -2113,7 +2112,6 @@ Rectangle BrowseBox::GetControlArea() const aHScroll->GetSizePixel().Height() ) ); } - void BrowseBox::SetMode( BrowserMode nMode ) { diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index df1df0806497..92991023a883 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -1103,7 +1103,6 @@ namespace svt return nId; } - void EditBrowseBox::Resize() { BrowseBox::Resize(); @@ -1122,15 +1121,22 @@ namespace svt if (!nX) nX = USHRT_MAX; - ReserveControlArea((sal_uInt16)nX); - } + bool bChanged = ReserveControlArea(nX); + + //tdf#97731 if the reserved area changed size, give the controls a + //chance to adapt to the new size + if (bChanged) + { + nX = (sal_uInt16)aPoint.X(); + ArrangeControls(nX, (sal_uInt16)aPoint.Y()); + } + } void EditBrowseBox::ArrangeControls(sal_uInt16&, sal_uInt16) { } - CellController* EditBrowseBox::GetController(long, sal_uInt16) { return nullptr; |