[Libreoffice-commits] core.git: Branch 'libreoffice-7-1' - svtools/source

[Caolán McNamara (via logerrit)]

 svtools/source/brwbox/brwbox1.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1590ab93d5af5752d2f9eaa72b210b1f82708a80
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 20 17:14:36 2021 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Fri Jan 22 14:52:21 2021 +0100

    keep the navigation bar control area the same size with hidden scrollbar
    
    which is the way it historically worked before...
    
    commit 7fd9bd4cdf4ffc03b2280964ef3f7e5917769bbd
    Author: Caolán McNamara <caolanm at redhat.com>
    Date:   Mon Jul 27 11:43:12 2020 +0100
    
        we want the position of the start of the scrollbar
    
    which added a visibility check that we don't actually want as the
    navigation bar spreads out in a ugly manner on a gridcontrol with
    only a few columns
    
    Change-Id: I9f24937c20dbab40e0d031195aa6e3e527cd52f6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109689
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx
index f1b42d910075..ebc139ee76d6 100644
--- a/svtools/source/brwbox/brwbox1.cxx
+++ b/svtools/source/brwbox/brwbox1.cxx
@@ -2119,7 +2119,7 @@ bool BrowseBox::ReserveControlArea(sal_uInt16 nWidth)
 tools::Rectangle BrowseBox::GetControlArea() const
 {
     auto nHeight = aHScroll->GetSizePixel().Height();
-    auto nEndRight = aHScroll->IsVisible() ? aHScroll->GetPosPixel().X() : GetOutputSizePixel().Width();
+    auto nEndRight = aHScroll->GetPosPixel().X();
 
     return tools::Rectangle(
         Point( 0, GetOutputSizePixel().Height() - nHeight ),