From 94d5e956952a071818dff6a7ef18996552b8363d Mon Sep 17 00:00:00 2001
From: Angelo Verlain <geoangercola@gmail.com>
Date: Fri, 6 Oct 2023 18:02:01 +0200
Subject: [PATCH] use AdwToolbarView

---
 Cargo.toml       |  2 +-
 meson.build      |  2 +-
 src/ui/window.ui | 13 ++++++-------
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b10c546..e72f4fd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -15,7 +15,7 @@ categories = ["gui", "multimedia"]
 
 [dependencies]
 pipewire = "0.7.1"
-adw = { version = "0.5", package = "libadwaita", features = ["v1_3"] }
+adw = { version = "0.5", package = "libadwaita", features = ["v1_4"] }
 glib = { version = "0.18", features = ["log"] }
 
 log = "0.4.11"
diff --git a/meson.build b/meson.build
index 2ecbebc..34bf0fa 100644
--- a/meson.build
+++ b/meson.build
@@ -12,7 +12,7 @@ base_id = 'org.pipewire.Helvum'
 
 dependency('glib-2.0',     version: '>= 2.66')
 dependency('gtk4',         version: '>= 4.4.0')
-dependency('libadwaita-1', version: '>= 1.3')
+dependency('libadwaita-1', version: '>= 1.4')
 dependency('libpipewire-0.3')
 
 desktop_file_validate = find_program('desktop-file-validate', required: false)
diff --git a/src/ui/window.ui b/src/ui/window.ui
index 22d72f1..f40432a 100644
--- a/src/ui/window.ui
+++ b/src/ui/window.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <requires lib="gtk" version="4.0"/>
-  <requires lib="Adw" version="1.0"/>
+  <requires lib="Adw" version="1.4"/>
   <menu id="primary_menu">
     <section>
       <item>
@@ -15,9 +15,8 @@
     <property name="default-height">720</property>
     <property name="title">Helvum - Pipewire Patchbay</property>
     <child>
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
+      <object class="AdwToolbarView">
+        <child type="top">
           <object class="AdwHeaderBar" id="header_bar">
             <child type="end">
               <object class="GtkMenuButton">
@@ -27,13 +26,13 @@
             </child>
           </object>
         </child>
-        <child>
+        <child type="top">
           <object class="AdwBanner" id="connection_banner">
             <property name="title" translatable="yes">Disconnected</property>
             <property name="revealed">false</property>
           </object>
         </child>
-        <child>
+        <property name="content">
           <object class="GtkOverlay">
             <child>
               <object class="GtkScrolledWindow">
@@ -55,7 +54,7 @@
               </object>
             </child>
           </object>
-        </child>
+        </property>
       </object>
     </child>
   </template>