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

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/toolbarmodedialog.ui |   39 ++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 14 deletions(-)

New commits:
commit 88a66f73f0182baffded6190f969bf7088236949
Author:     Heiko Tietze <tietze.heiko at gmail.com>
AuthorDate: Mon Nov 9 15:13:58 2020 +0100
Commit:     Heiko Tietze <heiko.tietze at documentfoundation.org>
CommitDate: Mon Nov 9 17:16:28 2020 +0100

    Resolves tdf#138051 - Text expands beyond dialog height
    
    GtkScrollWindow added to allow verbose descriptions
    
    Change-Id: Ifb3de54dece47646718d386566c6f2d2faf7b1ac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105481
    Tested-by: Jenkins
    Reviewed-by: Heiko Tietze <heiko.tietze at documentfoundation.org>

diff --git a/cui/uiconfig/ui/toolbarmodedialog.ui b/cui/uiconfig/ui/toolbarmodedialog.ui
index 3ff3632a4740..b823d77c47a6 100644
--- a/cui/uiconfig/ui/toolbarmodedialog.ui
+++ b/cui/uiconfig/ui/toolbarmodedialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.1 -->
 <interface domain="cui">
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkImage" id="imgApply">
@@ -11,6 +11,7 @@
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
     <property name="title" translatable="yes" context="ToolbarmodeDialog|Name">Select Your Preferred User Interface</property>
+    <property name="resizable">False</property>
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="type_hint">dialog</property>
@@ -320,20 +321,33 @@
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">True</property>
-                            <property name="position">1</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="lbInfo">
+                          <object class="GtkScrolledWindow">
+                            <property name="height_request">100</property>
                             <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="valign">start</property>
-                            <property name="vexpand">True</property>
-                            <property name="label">Information:</property>
-                            <property name="wrap">True</property>
-                            <property name="wrap_mode">word-char</property>
-                            <property name="max_width_chars">50</property>
-                            <property name="xalign">0</property>
+                            <property name="can_focus">True</property>
+                            <child>
+                              <object class="GtkViewport">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkLabel" id="lbInfo">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="valign">start</property>
+                                    <property name="vexpand">True</property>
+                                    <property name="label">Information:</property>
+                                    <property name="wrap">True</property>
+                                    <property name="wrap_mode">word-char</property>
+                                    <property name="max_width_chars">50</property>
+                                    <property name="xalign">0</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
                           </object>
                           <packing>
                             <property name="expand">False</property>
@@ -376,8 +390,5 @@
       <action-widget response="-5">btnApply</action-widget>
       <action-widget response="-7">btnClose</action-widget>
     </action-widgets>
-    <child type="titlebar">
-      <placeholder/>
-    </child>
   </object>
 </interface>