[gnome-boxes/restore-gtk-app-window-for-now] app-window: Revert the changes to use HdyWindow for the main window

[Felipe Borges <felipeborges src gnome org>]

commit 9f9344320c1ac599ca894be141c911c23d84f040
Author: Felipe Borges <felipeborges gnome org>
Date:   Thu Feb 4 12:51:28 2021 +0100

    app-window: Revert the changes to use HdyWindow for the main window
    
    This messes up with the existing logic in Boxes for showing the
    overlaying toolbar in fullscreen mode.
    
    I plan on reverting this back once I have time to re-work our
    fullscreen/overlay-toolbar logic to work properly with
    HdyHeaderBar and friends.
    
    See #650

 data/ui/app-window.ui | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/data/ui/app-window.ui b/data/ui/app-window.ui
index 67739a76..ff7ec4cc 100644
--- a/data/ui/app-window.ui
+++ b/data/ui/app-window.ui
@@ -29,7 +29,7 @@
 
   -->
 
-  <template class="BoxesAppWindow" parent="HdyApplicationWindow">
+  <template class="BoxesAppWindow" parent="GtkApplicationWindow">
     <property name="visible">False</property>
     <property name="show-menubar">False</property>
     <property name="title" translatable="yes">Boxes</property>
@@ -38,6 +38,12 @@
     <signal name="window-state-event" handler="on_window_state_event"/>
     <signal name="key-press-event" after="yes" handler="on_key_pressed"/>
 
+    <child type="titlebar">
+      <object class="BoxesTopbar" id="topbar">
+        <property name="visible">True</property>
+      </object>
+    </child>
+
     <child>
       <object class="GtkBox" id="main_vbox">
         <property name="visible">True</property>
@@ -48,12 +54,6 @@
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
 
-        <child>
-          <object class="BoxesTopbar" id="topbar">
-            <property name="visible">True</property>
-          </object>
-        </child>
-
         <child>
           <object class="BoxesSearchbar" id="searchbar">
             <property name="visible">True</property>