[nautilus/2070-menu-item-re-organization: 115/116] toolbar: Don't popdown menu when changing zoom

[António Fernandes <antoniof src gnome org>]

commit b1a11475724a0f5fda25f2f5ef7d042eb0b78052
Author: António Fernandes <antoniof gnome org>
Date:   Sun Mar 27 13:57:23 2022 +0100

    toolbar: Don't popdown menu when changing zoom
    
    Menu items close the menu by default. So, use custom widgets
    instead. The visual result is preserved.
    
    Fixes https://gitlab.gnome.org/GNOME/nautilus/-/issues/2112

 src/resources/ui/nautilus-toolbar.ui | 34 +++++++++++++++++++++++++++-------
 1 file changed, 27 insertions(+), 7 deletions(-)
---
diff --git a/src/resources/ui/nautilus-toolbar.ui b/src/resources/ui/nautilus-toolbar.ui
index 15c2afda6..a79ca35f4 100644
--- a/src/resources/ui/nautilus-toolbar.ui
+++ b/src/resources/ui/nautilus-toolbar.ui
@@ -54,14 +54,10 @@
       <attribute name="label" translatable="yes">Icon size</attribute>
       <attribute name="display-hint">inline-buttons</attribute>
       <item>
-        <attribute name="label" translatable="yes">Zoom out</attribute>
-        <attribute name="action">view.zoom-out</attribute>
-        <attribute name="verb-icon">zoom-out-symbolic</attribute>
+        <attribute name="custom">zoom-out</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">Zoom in</attribute>
-        <attribute name="action">view.zoom-in</attribute>
-        <attribute name="verb-icon">zoom-in-symbolic</attribute>
+        <attribute name="custom">zoom-in</attribute>
       </item>
     </section>
     <section id="undo_redo_section">
@@ -242,7 +238,31 @@
             <property name="focusable">True</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
-            <property name="menu-model">app_menu</property>
+            <property name="popover">
+              <object class="GtkPopoverMenu">
+                <property name="menu-model">app_menu</property>
+                <child type="zoom-out">
+                  <object class="GtkButton">
+                    <property name="icon-name">zoom-out-symbolic</property>
+                    <property name="action-name">view.zoom-out</property>
+                    <property name="tooltip-text">Zoom out</property>
+                    <style>
+                      <class name="flat"/>
+                    </style>
+                  </object>
+                </child>
+                <child type="zoom-in">
+                  <object class="GtkButton">
+                    <property name="icon-name">zoom-in-symbolic</property>
+                    <property name="action-name">view.zoom-in</property>
+                    <property name="tooltip-text">Zoom in</property>
+                    <style>
+                      <class name="flat"/>
+                    </style>
+                  </object>
+                </child>
+              </object>
+            </property>
             <child>
               <object class="GtkImage">
                 <property name="icon_name">open-menu-symbolic</property>