Handle own titlebuttons

meson.build

@@ -32,6 +32,8 @@ config_file = configure_file(
     configuration: config_data
 )
 
+adw_dep = dependency('libadwaita-1', version: '>=1.4')
+
 subdir('data')
 subdir('src')
 subdir('po')

src/Widgets/AppEntry.vala

@@ -48,10 +48,6 @@ public class Widgets.AppEntry : Gtk.ListBoxRow {
         };
 
         var grid = new Gtk.Grid () {
-            margin_start = 6,
-            margin_end = 6,
-            margin_top = 6,
-            margin_bottom = 6,
             column_spacing = 6
         };
         grid.attach (image, 0, 0, 1, 2);

src/Widgets/AppSettingsView.vala

@@ -50,6 +50,7 @@ public class Widgets.AppSettingsView : Switchboard.SettingsPage {
         box.append (remember_option);
 
         child = box;
+        show_end_title_buttons = true;
 
         update_selected_app ();
 

src/Widgets/Sidebar.vala

@@ -32,9 +32,20 @@ public class Widgets.Sidebar : Gtk.Box {
             hexpand = true
         };
 
-        var search_box = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
-        search_box.add_css_class (Granite.STYLE_CLASS_VIEW);
-        search_box.append (search_entry);
+        var search_revealer = new Gtk.Revealer () {
+            child = search_entry
+        };
+
+        var search_toggle = new Gtk.ToggleButton () {
+            icon_name = "edit-find-symbolic",
+            tooltip_text = _("Search Apps")
+        };
+
+        var headerbar = new Adw.HeaderBar () {
+            show_end_title_buttons = false,
+            show_title = false
+        };
+        headerbar.pack_end (search_toggle);
 
         var app_list = new Gtk.ListBox () {
             hexpand = true,
@@ -65,17 +76,25 @@ public class Widgets.Sidebar : Gtk.Box {
         footer.pack_start (do_not_disturb_label);
         footer.pack_end (do_not_disturb_switch);
 
-        orientation = Gtk.Orientation.VERTICAL;
-        append (search_box);
-        append (scrolled_window);
-        append (footer);
+        var toolbarview = new Adw.ToolbarView () {
+            content = scrolled_window,
+            top_bar_style = FLAT
+        };
+        toolbarview.add_top_bar (headerbar);
+        toolbarview.add_top_bar (search_revealer);
+        toolbarview.add_bottom_bar (footer);
+        toolbarview.add_css_class (Granite.STYLE_CLASS_SIDEBAR);
+
+        append (toolbarview);
 
         app_list.row_selected.connect (show_row);
 
         search_entry.search_changed.connect (() => {
             app_list.invalidate_filter ();
         });
 
+        search_toggle.bind_property ("active", search_revealer, "reveal-child");
+
         NotificationsPlug.notify_settings.bind (
             "do-not-disturb",
             app_list,

src/meson.build

@@ -18,6 +18,7 @@ shared_module(
     config_file,
     plug_resources,
     dependencies: [
+        adw_dep,
         dependency('glib-2.0'),
         dependency('gio-2.0'),
         dependency('gobject-2.0'),