[gnome-games/wip/exalm/cleanups: 1/5] collection-header-bar: Don't subclass GtkHeaderBar

[Alexander Mikhaylenko <alexm src gnome org>]

commit 1fc2651ee3ca164b543b5c32cf04af170010329d
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date:   Wed May 29 16:25:15 2019 +0500

    collection-header-bar: Don't subclass GtkHeaderBar
    
    It was made non-derivable in GTK4.

 data/ui/collection-header-bar.ui  | 155 ++++++++++++++++++++------------------
 src/ui/collection-header-bar.vala |   2 +-
 2 files changed, 81 insertions(+), 76 deletions(-)
---
diff --git a/data/ui/collection-header-bar.ui b/data/ui/collection-header-bar.ui
index e9b0b7cd..c293249e 100644
--- a/data/ui/collection-header-bar.ui
+++ b/data/ui/collection-header-bar.ui
@@ -1,103 +1,108 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk+" version="3.24"/>
-  <template class="GamesCollectionHeaderBar" parent="GtkHeaderBar">
+  <template class="GamesCollectionHeaderBar" parent="GtkBin">
     <property name="visible">True</property>
-    <property name="show_close_button">True</property>
     <child>
-      <object class="GtkButton" id="add_game">
+      <object class="GtkHeaderBar">
         <property name="visible">True</property>
-        <property name="valign">center</property>
-        <property name="use-underline">True</property>
-        <property name="action-name">app.add-game-files</property>
-        <style>
-          <class name="image-button"/>
-        </style>
-        <child internal-child="accessible">
-          <object class="AtkObject" id="a11y-back">
-            <property name="accessible-name" translatable="yes">Add game files…</property>
-          </object>
-        </child>
+        <property name="show_close_button">True</property>
         <child>
-          <object class="GtkImage" id="add_game_image">
+          <object class="GtkButton" id="add_game">
             <property name="visible">True</property>
-            <property name="icon-name">list-add-symbolic</property>
-            <property name="icon-size">1</property>
+            <property name="valign">center</property>
+            <property name="use-underline">True</property>
+            <property name="action-name">app.add-game-files</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="a11y-back">
+                <property name="accessible-name" translatable="yes">Add game files…</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkImage" id="add_game_image">
+                <property name="visible">True</property>
+                <property name="icon-name">list-add-symbolic</property>
+                <property name="icon-size">1</property>
+              </object>
+            </child>
           </object>
+          <packing>
+            <property name="pack-type">start</property>
+          </packing>
         </child>
-      </object>
-      <packing>
-        <property name="pack-type">start</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkMenuButton" id="menu">
-        <property name="popover">menu_popover</property>
-        <!-- Translators: tooltip for the application menu button -->
-        <property name="tooltip-text" translatable="yes">Menu</property>
-        <property name="use-underline">True</property>
-        <property name="valign">center</property>
-        <property name="visible">True</property>
-        <style>
-          <class name="image-button"/>
-        </style>
         <child>
-          <object class="GtkImage" id="menu_image">
+          <object class="GtkMenuButton" id="menu">
+            <property name="popover">menu_popover</property>
+            <!-- Translators: tooltip for the application menu button -->
+            <property name="tooltip-text" translatable="yes">Menu</property>
+            <property name="use-underline">True</property>
+            <property name="valign">center</property>
             <property name="visible">True</property>
-            <property name="icon-name">open-menu-symbolic</property>
-            <property name="icon-size">1</property>
+            <style>
+              <class name="image-button"/>
+            </style>
+            <child>
+              <object class="GtkImage" id="menu_image">
+                <property name="visible">True</property>
+                <property name="icon-name">open-menu-symbolic</property>
+                <property name="icon-size">1</property>
+              </object>
+            </child>
           </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
-      </object>
-      <packing>
-        <property name="pack-type">end</property>
-      </packing>
-    </child>
-    <child type="title">
-      <object class="GtkStack" id="title_stack">
-        <property name="visible">True</property>
-        <property name="transition-type">crossfade</property>
-        <child>
-          <object class="HdyViewSwitcher" id="view_switcher">
+        <child type="title">
+          <object class="GtkStack" id="title_stack">
             <property name="visible">True</property>
+            <property name="transition-type">crossfade</property>
+            <child>
+              <object class="HdyViewSwitcher" id="view_switcher">
+                <property name="visible">True</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkLabel" id="empty_title">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">Games</property>
+                <style>
+                  <class name="title"/>
+                </style>
+              </object>
+            </child>
           </object>
         </child>
         <child>
-          <object class="GtkLabel" id="empty_title">
+          <object class="GtkToggleButton" id="search">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Games</property>
+            <property name="valign">center</property>
+            <property name="use-underline">True</property>
             <style>
-              <class name="title"/>
+              <class name="image-button"/>
             </style>
+            <child internal-child="accessible">
+              <object class="AtkObject" id="a11y-search">
+                <property name="accessible-name" translatable="yes">Search</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkImage" id="search_image">
+                <property name="visible">True</property>
+                <property name="icon-name">edit-find-symbolic</property>
+                <property name="icon-size">1</property>
+              </object>
+            </child>
           </object>
+          <packing>
+            <property name="pack-type">end</property>
+          </packing>
         </child>
       </object>
     </child>
-    <child>
-      <object class="GtkToggleButton" id="search">
-        <property name="visible">True</property>
-        <property name="valign">center</property>
-        <property name="use-underline">True</property>
-        <style>
-          <class name="image-button"/>
-        </style>
-        <child internal-child="accessible">
-          <object class="AtkObject" id="a11y-search">
-            <property name="accessible-name" translatable="yes">Search</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkImage" id="search_image">
-            <property name="visible">True</property>
-            <property name="icon-name">edit-find-symbolic</property>
-            <property name="icon-size">1</property>
-          </object>
-        </child>
-      </object>
-      <packing>
-        <property name="pack-type">end</property>
-      </packing>
-    </child>
   </template>
   <object class="GtkPopover" id="menu_popover">
     <property name="visible">False</property>
diff --git a/src/ui/collection-header-bar.vala b/src/ui/collection-header-bar.vala
index 5f42ffcf..9cbb528c 100644
--- a/src/ui/collection-header-bar.vala
+++ b/src/ui/collection-header-bar.vala
@@ -1,7 +1,7 @@
 // This file is part of GNOME Games. License: GPL-3.0+.
 
 [GtkTemplate (ui = "/org/gnome/Games/ui/collection-header-bar.ui")]
-private class Games.CollectionHeaderBar : Gtk.HeaderBar {
+private class Games.CollectionHeaderBar : Gtk.Bin {
        public bool search_mode { get; set; }
        private Gtk.Stack _viewstack;
        public Gtk.Stack viewstack {