summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-01-27 12:43:25 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-01-27 15:15:24 +0100
commitc79426288318b1dd52eff5b38d0e49f37e21b626 (patch)
tree238bb1fa57abfa06f26efaa700b134cc7439b794
parentd5c2ae6031ff075aad0705c1955f82f59e331769 (diff)
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/+/110014 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sfx2/source/appl/newhelp.cxx1
-rw-r--r--sfx2/uiconfig/ui/helpwindow.ui5
2 files changed, 2 insertions, 4 deletions
diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx
index 065f18c820a9..c57522ad55e5 100644
--- a/sfx2/source/appl/newhelp.cxx
+++ b/sfx2/source/appl/newhelp.cxx
@@ -2448,7 +2448,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>