cui/source/tabpages/autocdlg.cxx | 8 ++++++++ cui/uiconfig/ui/acorreplacepage.ui | 11 ++--------- 2 files changed, 10 insertions(+), 9 deletions(-)
New commits: commit f6a2b24ce17293043f7ddbed0bc218264be6487d Author: Caolán McNamara <[email protected]> AuthorDate: Mon Sep 30 14:18:29 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Tue Oct 1 09:53:15 2019 +0200 autocorrect dialog width grows on change of new to replace the sizegroup isn't working as I'd expect, so just make the replace button visible, get the preferred width of the buttonbox, lock that down then hide the place button and the container will stay at the max width that will be wanted Change-Id: Idfe632aa5af404abb92fc8f7267f0dda5cdbe295 Reviewed-on: https://gerrit.libreoffice.org/79862 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index b9a74380d294..d95471f14b0f 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -669,9 +669,17 @@ OfaAutocorrReplacePage::OfaAutocorrReplacePage(weld::Container* pPage, weld::Dia , m_xNewReplacePB(m_xBuilder->weld_button("new")) , m_xReplacePB(m_xBuilder->weld_button("replace")) , m_xDeleteReplacePB(m_xBuilder->weld_button("delete")) + , m_xButtonBox(m_xBuilder->weld_container("buttonbox")) { sNew = m_xNewReplacePB->get_label(); sModify = m_xReplacePB->get_label(); + + // lock down the width of the button box to its max + // desired width + auto nMaxWidth = m_xButtonBox->get_preferred_size().Width(); + m_xButtonBox->set_size_request(nMaxWidth, -1); + m_xReplacePB->hide(); + // tdf#125348 set some small but fixed initial width size, final width will // depend on the size of the entry boxes m_xReplaceTLB->set_size_request(42, m_xReplaceTLB->get_height_rows(10)); diff --git a/cui/uiconfig/ui/acorreplacepage.ui b/cui/uiconfig/ui/acorreplacepage.ui index 36808eb4ec4d..b099bf079991 100644 --- a/cui/uiconfig/ui/acorreplacepage.ui +++ b/cui/uiconfig/ui/acorreplacepage.ui @@ -21,12 +21,11 @@ <property name="row_spacing">6</property> <property name="column_spacing">12</property> <child> - <object class="GtkButtonBox" id="buttonbox1"> + <object class="GtkBox" id="buttonbox"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> <property name="spacing">12</property> - <property name="layout_style">start</property> <child> <object class="GtkButton" id="new"> <property name="label">gtk-new</property> @@ -45,6 +44,7 @@ <child> <object class="GtkButton" id="replace"> <property name="label" translatable="yes" context="acorreplacepage|replace">_Replace</property> + <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> <property name="no_show_all">True</property> @@ -233,11 +233,4 @@ <placeholder/> </child> </object> - <object class="GtkSizeGroup" id="sizegroup1"> - <widgets> - <widget name="new"/> - <widget name="replace"/> - <widget name="delete"/> - </widgets> - </object> </interface> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
