summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-05-05 10:51:16 +0100
committerAndras Timar <andras.timar@collabora.com>2021-05-06 16:40:09 +0200
commit15a9ae5575ebbbe57c110ba39b3701c62af612c6 (patch)
tree02b235b1699372f750dec195eae709f6e3420f58
parent19a3021c2254522fd5f2a4d6eb6362048b5036b4 (diff)
Resolves: tdf#142049 expand widget to use unused extra space
also includes... Related: tdf#142049 restore some elements default visibility in the ui these defaulted to not visible before... commit ec548bce309d965a25e807ae79432114926e06f3 Author: Caolán McNamara <caolanm@redhat.com> Date: Mon Oct 15 11:14:02 2018 +0100 weld ChartTypeDialog and SchLayoutTabPage Change-Id: I101c56b855d0bdc43559ca4561d298fa4ad92572 Reviewed-on: https://gerrit.libreoffice.org/61797 Change-Id: I7ff6aa4feeccd790b6176cb60b6adb9b21db0f63 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115136 Tested-by: Jenkins Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--chart2/source/controller/dialogs/res_BarGeometry.cxx3
-rw-r--r--chart2/uiconfig/ui/tp_ChartType.ui11
2 files changed, 9 insertions, 5 deletions
diff --git a/chart2/source/controller/dialogs/res_BarGeometry.cxx b/chart2/source/controller/dialogs/res_BarGeometry.cxx
index da48f4ca608a..182d391aac33 100644
--- a/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -29,7 +29,8 @@ BarGeometryResources::BarGeometryResources(weld::Builder* pBuilder)
{
for (size_t i = 0; i < SAL_N_ELEMENTS(CHART_TYPE); ++i)
m_xLB_Geometry->append_text(SchResId(CHART_TYPE[i]));
- m_xLB_Geometry->set_size_request(-1, m_xLB_Geometry->get_height_rows(4));
+ m_xLB_Geometry->set_size_request(-1,
+ m_xLB_Geometry->get_height_rows(SAL_N_ELEMENTS(CHART_TYPE)));
}
void BarGeometryResources::connect_changed(const Link<weld::TreeView&, void>& rLink)
diff --git a/chart2/uiconfig/ui/tp_ChartType.ui b/chart2/uiconfig/ui/tp_ChartType.ui
index 503ab73290fd..1a4ad6c4b04f 100644
--- a/chart2/uiconfig/ui/tp_ChartType.ui
+++ b/chart2/uiconfig/ui/tp_ChartType.ui
@@ -75,7 +75,7 @@
<property name="row_spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="subtypewin">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
<property name="hscrollbar_policy">never</property>
@@ -87,7 +87,7 @@
<property name="can_focus">True</property>
<child>
<object class="GtkDrawingArea" id="subtype">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">True</property>
<property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
<property name="hexpand">True</property>
@@ -111,6 +111,8 @@
<object class="GtkGrid" id="3dblock">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="row_spacing">3</property>
<child>
<!-- n-columns=1 n-rows=1 -->
@@ -193,6 +195,7 @@
<object class="GtkTreeView" id="shape">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="vexpand">True</property>
<property name="model">liststore1</property>
<property name="headers_visible">False</property>
@@ -469,14 +472,14 @@
</child>
<child>
<object class="GtkScrolledWindow">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">False</property>
<property name="vexpand">True</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="charttype">
- <property name="visible">True</property>
+ <property name="visible">False</property>
<property name="can_focus">True</property>
<property name="vexpand">True</property>
<property name="model">liststore2</property>