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

[diwanshu885 (via logerrit)]

 cui/source/dialogs/FontFeaturesDialog.cxx |    5 +++++
 cui/uiconfig/ui/fontfeaturesdialog.ui     |    5 +++--
 2 files changed, 8 insertions(+), 2 deletions(-)

New commits:
commit e97bccdba42b464e2df8d5996d4cdc9b03b6c243
Author:     diwanshu885 <dmittal885 at gmail.com>
AuthorDate: Wed Dec 9 00:44:10 2020 +0530
Commit:     Jim Raykowski <raykowj at gmail.com>
CommitDate: Fri Jan 15 22:49:57 2021 +0100

    tdf#128176 Add a vertical scrollwindow to fontfeaturesdialog
    
    Change-Id: Id58b3888069fd0136f5620cb5f82c8649a0dfd76
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107435
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>

diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx
index c1e79b4515d7..71c9e34d3e73 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -75,6 +75,11 @@ void FontFeaturesDialog::initialize()
 
     fillGrid(rFilteredFontFeatures);
 
+    m_xContentWindow->set_size_request(
+        -1, std::min(std::max(m_xContentWindow->get_preferred_size().Height(),
+                              m_xContentGrid->get_preferred_size().Height()),
+                     300L));
+
     updateFontPreview();
 }
 
diff --git a/cui/uiconfig/ui/fontfeaturesdialog.ui b/cui/uiconfig/ui/fontfeaturesdialog.ui
index f283cff7ebed..fa36d66ff476 100644
--- a/cui/uiconfig/ui/fontfeaturesdialog.ui
+++ b/cui/uiconfig/ui/fontfeaturesdialog.ui
@@ -84,8 +84,8 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="hscrollbar_policy">never</property>
-                <property name="vscrollbar_policy">never</property>
-                <property name="shadow_type">in</property>
+                <property name="vscrollbar_policy">automatic</property>
+                <property name="shadow_type">none</property>
                 <child>
                   <object class="GtkViewport">
                     <property name="visible">True</property>
@@ -98,6 +98,7 @@
                         <property name="valign">start</property>
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">12</property>
+                        <property name="margin">6</property>
                         <child>
                           <placeholder/>
                         </child>