diff options
| author | Szymon Kłos <szymon.klos@collabora.com> | 2023-08-29 15:59:26 +0200 |
|---|---|---|
| committer | Szymon Kłos <szymon.klos@collabora.com> | 2023-09-11 11:56:12 +0200 |
| commit | 359190cb6ae2c76356de7f9368abc849c7696415 (patch) | |
| tree | 90ff6eab0251cf813446998fc1f81cf9cf47cf7a | |
| parent | 819dec3533750a3a8f483351febe40aae85ca0b7 (diff) | |
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 <jenkinscollaboraoffice@gmail.com>
Reviewed-by: Pranam Lashkari <lpranam@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156813
Tested-by: Jenkins
Reviewed-by: Szymon Kłos <szymon.klos@collabora.com>
| -rw-r--r-- | chart2/source/controller/dialogs/dlg_ChartType.cxx | 2 | ||||
| -rw-r--r-- | chart2/uiconfig/ui/charttypedialog.ui | 14 |
2 files changed, 14 insertions, 2 deletions
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> |