summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-08-05 11:18:45 +0100
committerAndras Timar <andras.timar@collabora.com>2021-08-16 10:07:49 +0200
commitd5e610524ecf0b4b4fba97f0feb14ce4b46a27e2 (patch)
treefeca50465d2cb4f95c4d51d50f369a010d6d183c /sw
parent9e0dec0ea1c8fcf7f5eec638ba98e11f378f3866 (diff)
Resolves: tdf#143720 treeview not resizing to fill available space
Change-Id: I041c3a743b8624f49bfe57e8a4469535e334e5dc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120068 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/ui/index/cnttab.cxx5
-rw-r--r--sw/uiconfig/swriter/ui/assignstylesdialog.ui1
2 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index bcabdc6aabbb..23b14d20e410 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -513,7 +513,8 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(weld::Window* pParent,
aWidths.push_back(m_xHeaderTree->get_pixel_size(sTitle).Width() + nPadding);
}
m_xHeaderTree->set_column_fixed_widths(aWidths);
- auto nWidth = std::accumulate(aWidths.begin(), aWidths.end(), 0);
+ auto nWidth = std::accumulate(aWidths.begin(), aWidths.end(),
+ Application::GetSettings().GetStyleSettings().GetScrollBarSize());
m_xHeaderTree->set_size_request(nWidth, m_xHeaderTree->get_height_rows(15));
int nRow(0);
@@ -576,7 +577,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(weld::Window* pParent,
IMPL_LINK(SwAddStylesDlg_Impl, TreeSizeAllocHdl, const Size&, rSize, void)
{
- auto nWidth = rSize.Width();
+ auto nWidth = rSize.Width() - Application::GetSettings().GetStyleSettings().GetScrollBarSize();
std::vector<int> aWidths;
aWidths.push_back(0);
diff --git a/sw/uiconfig/swriter/ui/assignstylesdialog.ui b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
index 33902bf15a0e..51c846eb27c5 100644
--- a/sw/uiconfig/swriter/ui/assignstylesdialog.ui
+++ b/sw/uiconfig/swriter/ui/assignstylesdialog.ui
@@ -186,6 +186,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="hexpand">True</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkButtonBox" id="buttonbox1">