chart2/source/controller/dialogs/dlg_ChartType.cxx | 2 +-
chart2/uiconfig/ui/charttypedialog.ui | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 2d9e0a7ffa29a0882b92c55e90189e509124e2de
Author: Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Tue Aug 29 15:59:26 2023 +0200
Commit: Szymon Kłos <szymon.k...@collabora.com>
CommitDate: Fri Sep 1 10:35:03 2023 +0200
jsdialog: fix layout of chart type dialog
directly set content area container to avoid
buttons on top of the dialog in lok case
Change-Id: I8353102f679a8f19c3041c7b4ec0b1200ed7d515
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156254
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Pranam Lashkari <lpra...@collabora.com>
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx
b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 4fb7de7ead72..e6e88dae42b8 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -31,7 +31,7 @@ ChartTypeDialog::ChartTypeDialog(weld::Window* pParent,
rtl::Reference<::chart::ChartModel>
xChartModel)
: GenericDialogController(pParent, "modules/schart/ui/charttypedialog.ui",
"ChartTypeDialog")
, m_xChartModel(std::move(xChartModel))
- , m_xContentArea(m_xDialog->weld_content_area())
+ , m_xContentArea(m_xBuilder->weld_container("content"))
{
m_xChartTypeTabPage = std::make_unique<ChartTypeTabPage>(
m_xContentArea.get(), this, m_xChartModel, false /*don't show title
description*/);
diff --git a/chart2/uiconfig/ui/charttypedialog.ui
b/chart2/uiconfig/ui/charttypedialog.ui
index 5f7c1cb13f71..627a619d0b57 100644
--- a/chart2/uiconfig/ui/charttypedialog.ui
+++ b/chart2/uiconfig/ui/charttypedialog.ui
@@ -76,7 +76,19 @@
</packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkBox" id="content">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
</child>
