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

[Libreoffice Gerrit user]

 cui/uiconfig/ui/borderpage.ui          |    9 ++++++---
 sw/uiconfig/swriter/ui/textgridpage.ui |    2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 0e41c75dac5dac3d6350fcfeaeb531ddd335294f
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 7 20:19:54 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Sep 8 15:07:42 2018 +0200

    fix various focus problems
    
    Change-Id: Ic510420ec486fdf77438891d08521039d180e5d4
    Reviewed-on: https://gerrit.libreoffice.org/60170
    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/uiconfig/ui/borderpage.ui b/cui/uiconfig/ui/borderpage.ui
index 020318cf1a06..912dbaa65f11 100644
--- a/cui/uiconfig/ui/borderpage.ui
+++ b/cui/uiconfig/ui/borderpage.ui
@@ -82,6 +82,7 @@
                               <object class="GtkDrawingArea" id="framesel">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
                               </object>
                             </child>
                           </object>
@@ -136,6 +137,7 @@
                               <object class="GtkDrawingArea" id="presets">
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
                               </object>
                             </child>
                           </object>
@@ -257,7 +259,7 @@
                     <child>
                       <object class="GtkMenuButton" id="linestylelb">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
                         <child>
@@ -285,7 +287,7 @@
                     <child>
                       <object class="GtkMenuButton" id="linecolorlb">
                         <property name="visible">True</property>
-                        <property name="can_focus">False</property>
+                        <property name="can_focus">True</property>
                         <property name="receives_default">False</property>
                         <property name="xalign">0</property>
                         <child>
@@ -563,7 +565,7 @@
                 <child>
                   <object class="GtkMenuButton" id="shadowcolorlb">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="xalign">0</property>
                     <child>
@@ -591,6 +593,7 @@
                           <object class="GtkDrawingArea" id="shadows">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
                           </object>
                         </child>
                       </object>
diff --git a/sw/uiconfig/swriter/ui/textgridpage.ui b/sw/uiconfig/swriter/ui/textgridpage.ui
index 811f68ee9a30..820acaa3ffda 100644
--- a/sw/uiconfig/swriter/ui/textgridpage.ui
+++ b/sw/uiconfig/swriter/ui/textgridpage.ui
@@ -491,7 +491,7 @@
                 <child>
                   <object class="GtkMenuButton" id="listLB_COLOR">
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
+                    <property name="can_focus">True</property>
                     <property name="receives_default">False</property>
                     <property name="halign">start</property>
                     <property name="valign">center</property>