From af2903d263a3d1daa4910058a61cb54bbbad30e5 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 26 Apr 2020 21:13:16 -0400
Subject: [PATCH] widget-factory: Improve the textview on page 3

Remove an extra frame, make the buttons linked, and
add tooltips.
---
 demos/widget-factory/widget-factory.ui | 28 ++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index e4ad4d8cb6..03b175a862 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -2581,37 +2581,47 @@ microphone-sensitivity-medium-symbolic</property>
                             </child>
                           </object>
                         </child>
-                        <child>
-                          <object class="GtkFrame">
                             <child>
                               <object class="GtkBox">
                                 <child>
                                   <object class="GtkBox">
                                     <property name="orientation">vertical</property>
+                                    <style>
+                                      <class name="linked"/>
+                                    </style>
                                     <child>
                                       <object class="GtkButton" id="toolbutton1">
                                         <property name="icon-name">document-open-symbolic</property>
+                                        <property name="focus-on-click">0</property>
+                                        <property name="tooltip-text" translatable="yes">Insert ⌘</property>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="toolbutton2">
                                         <property name="icon-name">send-to-symbolic</property>
+                                        <property name="focus-on-click">0</property>
+                                        <property name="tooltip-text" translatable="yes">Insert ⚽</property>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="toolbutton3">
                                         <property name="icon-name">view-fullscreen-symbolic</property>
+                                        <property name="focus-on-click">0</property>
+                                        <property name="tooltip-text" translatable="yes">Insert ⤢</property>
                                       </object>
                                     </child>
                                     <child>
                                       <object class="GtkButton" id="toolbutton4">
                                         <property name="icon-name">star-new-symbolic</property>
+                                        <property name="focus-on-click">0</property>
+                                        <property name="tooltip-text" translatable="yes">Insert ☆</property>
                                       </object>
                                     </child>
                                   </object>
                                 </child>
                                 <child>
                                   <object class="GtkScrolledWindow">
+                                    <property name="has-frame">1</property>
                                     <property name="hexpand">1</property>
                                     <child>
                                       <object class="GtkTextView" id="tooltextview"/>
@@ -2621,10 +2631,6 @@ microphone-sensitivity-medium-symbolic</property>
                                 <child>
                                   <object class="GtkBox">
                                     <property name="orientation">vertical</property>
-                                    <property name="margin-start">6</property>
-                                    <property name="margin-end">6</property>
-                                    <property name="margin-top">6</property>
-                                    <property name="margin-bottom">6</property>
                                     <child>
                                       <object class="GtkBox">
                                         <property name="orientation">vertical</property>
@@ -2635,18 +2641,24 @@ microphone-sensitivity-medium-symbolic</property>
                                           <object class="GtkButton" id="cutbutton">
                                             <property name="sensitive">0</property>
                                             <property name="icon-name">edit-cut-symbolic</property>
+                                            <property name="focus-on-click">0</property>
+                                            <property name="tooltip-text" translatable="yes">Cut</property>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkButton" id="copybutton">
                                             <property name="sensitive">0</property>
                                             <property name="icon-name">edit-copy-symbolic</property>
+                                            <property name="focus-on-click">0</property>
+                                            <property name="tooltip-text" translatable="yes">Copy</property>
                                           </object>
                                         </child>
                                         <child>
                                           <object class="GtkButton" id="pastebutton">
                                             <property name="sensitive">0</property>
                                             <property name="icon-name">edit-paste-symbolic</property>
+                                            <property name="focus-on-click">0</property>
+                                            <property name="tooltip-text" translatable="yes">Paste</property>
                                           </object>
                                         </child>
                                       </object>
@@ -2656,14 +2668,14 @@ microphone-sensitivity-medium-symbolic</property>
                                         <property name="sensitive">0</property>
                                         <property name="valign">end</property>
                                         <property name="icon-name">edit-delete-symbolic</property>
+                                        <property name="focus-on-click">0</property>
+                                        <property name="tooltip-text" translatable="yes">Delete</property>
                                       </object>
                                     </child>
                                   </object>
                                 </child>
                               </object>
                             </child>
-                          </object>
-                        </child>
                         <child>
                           <object class="GtkOverlay">
                             <child type="overlay">