[Libreoffice-commits] core.git: framework/source svtools/source

[Caolán McNamara (via logerrit)]

 framework/source/uielement/comboboxtoolbarcontroller.cxx |    2 +-
 svtools/source/brwbox/ebbcontrols.cxx                    |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit fb4e341ec16a81d5d7f487f801d6b93837bc4c9f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed May 20 16:21:23 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu May 21 20:15:27 2020 +0200

    tweak to narrow stretchable widget defaults
    
    Change-Id: Idcaea1fbd9df0389e2182f1014e8d3ed45d1b2f8
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94604
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx
index 1fc8d1e89c5e..8876160df615 100644
--- a/framework/source/uielement/comboboxtoolbarcontroller.cxx
+++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx
@@ -78,7 +78,7 @@ ComboBoxControl::ComboBoxControl(vcl::Window* pParent, ComboboxToolbarController
     m_xWidget->connect_changed(LINK(this, ComboBoxControl, ModifyHdl));
     m_xWidget->connect_entry_activate(LINK(this, ComboBoxControl, ActivateHdl));
 
-    m_xWidget->set_entry_width_chars(1); // so a smaller that default width can be used by ComboboxToolbarController
+    m_xWidget->set_entry_width_chars(1); // so a smaller than default width can be used by ComboboxToolbarController
     SetSizePixel(get_preferred_size());
 }
 
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index b60c71feaa92..9c398823f8a1 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -31,6 +31,7 @@ namespace svt
         : InterimItemWindow(pParent, "svt/ui/combocontrol.ui", "ComboControl")
         , m_xWidget(m_xBuilder->weld_combo_box("combobox"))
     {
+        m_xWidget->set_entry_width_chars(1); // so a smaller than default width can be used
     }
 
     void ComboBoxControl::dispose()
@@ -107,6 +108,7 @@ namespace svt
         : InterimItemWindow(pParent, "svt/ui/listcontrol.ui", "ListControl")
         , m_xWidget(m_xBuilder->weld_combo_box("listbox"))
     {
+        m_xWidget->set_size_request(42, -1); // so a later narrow size request can stick
     }
 
     void ListBoxControl::dispose()