[Libreoffice-commits] core.git: cui/source cui/uiconfig

[Caolán McNamara (via logerrit)]

 cui/source/customize/cfg.cxx          |    2 +-
 cui/uiconfig/ui/iconselectordialog.ui |    4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit c9956772ec0678498515fb60dca41e9a77457f86
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Apr 18 15:27:25 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Apr 18 18:32:03 2019 +0200

    Resolves: tdf#124809 spacing ignored unless WB_ITEMBORDER is set
    
    Change-Id: I29d63926c605d3f143c242337e31388123f22cff
    Reviewed-on: https://gerrit.libreoffice.org/70939
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 2796a2ddd910..7075423ffc7a 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2648,7 +2648,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog(weld::Window *pWindow,
         m_xFtNote->set_label(SvxConfigPageHelper::replaceSixteen(m_xFtNote->get_label(), m_nExpectedSize));
     }
 
-    m_xTbSymbol->SetStyle(m_xTbSymbol->GetStyle() | WB_VSCROLL);
+    m_xTbSymbol->SetStyle(m_xTbSymbol->GetStyle() | WB_ITEMBORDER | WB_VSCROLL);
     m_xTbSymbol->SetColCount(11);
     m_xTbSymbol->SetLineCount(5);
     m_xTbSymbol->SetItemWidth(m_nExpectedSize);
diff --git a/cui/uiconfig/ui/iconselectordialog.ui b/cui/uiconfig/ui/iconselectordialog.ui
index a12fee076901..4f55c547cdbc 100644
--- a/cui/uiconfig/ui/iconselectordialog.ui
+++ b/cui/uiconfig/ui/iconselectordialog.ui
@@ -127,6 +127,10 @@
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="events">GDK_BUTTON_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+                                    <property name="margin_left">3</property>
+                                    <property name="margin_right">3</property>
+                                    <property name="margin_top">3</property>
+                                    <property name="margin_bottom">3</property>
                                     <property name="hexpand">True</property>
                                     <property name="vexpand">True</property>
                                   </object>