[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sw/source

[Caolán McNamara]

 sw/source/uibase/utlui/navipi.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 935c1294c21db82a6b96836057cd3a2e66351e89
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 30 09:14:04 2015 +0100

    Resolves: tdf#93187 gtk3 spin box element in navigator cut-off
    
    Change-Id: Ifc1f226a38328e6ce02d3181917dd0530f320914
    (cherry picked from commit 1e468ed58994f4eb75519cb52111ed942fbc7377)
    Reviewed-on: https://gerrit.libreoffice.org/19021
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 2f19e1f..f26f871 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -699,6 +699,8 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
     Rectangle aSecondRect = aContentToolBox->GetItemRect(FN_SELECT_HEADER);
     Size aItemWinSize( aFirstRect.Left() - aSecondRect.Left(),
                        aFirstRect.Bottom() - aFirstRect.Top() );
+    Size aOptimalSize(pEdit->get_preferred_size());
+    aItemWinSize.Width() = std::max(aItemWinSize.Width(), aOptimalSize.Width());
     pEdit->SetSizePixel(aItemWinSize);
     aContentToolBox->InsertSeparator(4);
     aContentToolBox->InsertWindow( FN_PAGENUMBER, pEdit, ToolBoxItemBits::NONE, 4);