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

[Caolán McNamara (via logerrit)]

 sfx2/source/appl/newhelp.cxx   |    1 -
 sfx2/uiconfig/ui/helpwindow.ui |    5 ++---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit a42e8da35681e5b3f944326bb175ff2ce05f5730
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jan 27 12:43:25 2021 +0000
Commit:     Adolfo Jayme Barrientos <fitojb at ubuntu.com>
CommitDate: Wed Jan 27 16:44:50 2021 +0100

    tdf#138727 help browser didn't flow text
    
    because of its size request, while the paned shrink lets the pane shrink
    below the size request the contents stay at a min of the size request
    and aren't really shrunk, just clipped. Instead don't let the pane
    shrink but don't set a size.request letting it shrink to its natural
    min of its contents which are then truly resized so the text flow works.
    
    Change-Id: Iaf6738ace28c82379ac6322310de9a22f9653473
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109983
    Tested-by: Jenkins
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 10e53fa6c435..25662b745aaa 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2451,7 +2451,6 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl(
     m_xContainer->connect_size_allocate(LINK(this, SfxHelpWindow_Impl, ResizeHdl));
     m_xHelpPaneWindow = m_xBuilder->weld_container("helppanewindow");
     m_xHelpTextWindow = m_xBuilder->weld_container("helptextwindow");
-    m_xHelpTextWindow->set_size_request(m_xHelpTextWindow->get_approximate_digit_width() * 120, -1);
     m_xHelpTextXWindow = m_xHelpTextWindow->CreateChildFrame();
 
     pHelpInterceptor->InitWaiter( this );
diff --git a/sfx2/uiconfig/ui/helpwindow.ui b/sfx2/uiconfig/ui/helpwindow.ui
index 2505167b8c92..53f589bb67a4 100644
--- a/sfx2/uiconfig/ui/helpwindow.ui
+++ b/sfx2/uiconfig/ui/helpwindow.ui
@@ -20,7 +20,7 @@
         </child>
       </object>
       <packing>
-        <property name="resize">True</property>
+        <property name="resize">False</property>
         <property name="shrink">False</property>
       </packing>
     </child>
@@ -43,7 +43,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="toolbar_style">icons</property>
-                <property name="show_arrow">False</property>
                 <child>
                   <object class="GtkToolButton" id="index">
                     <property name="visible">True</property>
@@ -196,7 +195,7 @@
       </object>
       <packing>
         <property name="resize">True</property>
-        <property name="shrink">True</property>
+        <property name="shrink">False</property>
       </packing>
     </child>
   </object>