commit c418b6fdbefa8d847723a14c25b68bf0c6ac66af
author Caolán McNamara <caolanm@redhat.com> Mon Oct 14 20:20:45 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Tue Oct 15 09:57:36 2019 +0200
tree 69709623d61e806d289837d60ae34a6dc4431c88
parent 4704acf63f4fed3a99fc95ff63c82eb5a9ae3908

Resolves: tdf#128140 stabilize formula dialog width

Change-Id: Ifdb80adfd4b399035ed793f8636f31b90cf50094
Reviewed-on: https://gerrit.libreoffice.org/80800
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

formula/source/ui/dlg/formula.cxx

diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 70e33b0..5f9a94f 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -253,19 +253,21 @@ FormulaDlg_Impl::FormulaDlg_Impl(weld::Dialog& rDialog,
    , m_xEdRef(new RefEdit(rBuilder.weld_entry("ED_REF")))
    , m_xRefBtn(new RefButton(rBuilder.weld_button("RB_REF")))
{
    auto nWidth = m_xMEdit->get_approximate_digit_width() * 62;

    //Space for two lines of text
    m_xFtHeadLine->set_label("X\nX\n");
    auto nHeight = m_xFtHeadLine->get_preferred_size().Height();
    m_xFtHeadLine->set_size_request(-1, nHeight);
    m_xFtHeadLine->set_size_request(nWidth, nHeight);
    m_xFtHeadLine->set_label("");

    m_xFtFuncName->set_label("X\nX\n");
    nHeight = m_xFtFuncName->get_preferred_size().Height();
    m_xFtFuncName->set_size_request(-1, nHeight);
    m_xFtFuncDesc->set_size_request(-1, nHeight);
    m_xFtFuncName->set_size_request(nWidth, nHeight);
    m_xFtFuncDesc->set_size_request(nWidth, nHeight);
    m_xFtFuncName->set_label("");

    m_xMEdit->set_size_request(m_xMEdit->get_approximate_digit_width() * 62,
    m_xMEdit->set_size_request(nWidth,
                               m_xMEdit->get_height_rows(5));

    m_xEdRef->SetReferences(_pDlg, m_xFtEditName.get());

formula/uiconfig/ui/formuladialog.ui

diff --git a/formula/uiconfig/ui/formuladialog.ui b/formula/uiconfig/ui/formuladialog.ui
index 7c88ecd..46d9269 100644
--- a/formula/uiconfig/ui/formuladialog.ui
+++ b/formula/uiconfig/ui/formuladialog.ui
@@ -339,7 +339,7 @@
                          <object class="GtkLabel" id="headline">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="halign">start</property>
                            <property name="hexpand">True</property>
                            <property name="wrap">True</property>
                            <property name="xalign">0</property>
                            <property name="yalign">0</property>
@@ -356,7 +356,7 @@
                          <object class="GtkLabel" id="funcname">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="halign">start</property>
                            <property name="hexpand">True</property>
                            <property name="wrap">True</property>
                            <property name="xalign">0</property>
                            <property name="yalign">0</property>
@@ -370,7 +370,7 @@
                          <object class="GtkLabel" id="funcdesc">
                            <property name="visible">True</property>
                            <property name="can_focus">False</property>
                            <property name="halign">start</property>
                            <property name="hexpand">True</property>
                            <property name="vexpand">True</property>
                            <property name="wrap">True</property>
                            <property name="xalign">0</property>