Handle own titlebuttons (#100)

elementary · Mar 21, 2024 · 468dea7 · 468dea7
1 parent dd1b093
commit 468dea7
Show file tree

Hide file tree

Showing 6 changed files with 52 additions and 26 deletions.
diff --git a/meson.build b/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')
diff --git a/src/Widgets/AppEntry.vala b/src/Widgets/AppEntry.vala
@@ -30,7 +30,7 @@ public class Widgets.AppEntry : Gtk.ListBoxRow {
 
     construct {
         var image = new Gtk.Image.from_gicon (app.app_info.get_icon ()) {
-            pixel_size = 32
+            icon_size = LARGE
         };
 
         var title_label = new Gtk.Label (app.app_info.get_display_name ()) {
@@ -46,12 +46,9 @@ public class Widgets.AppEntry : Gtk.ListBoxRow {
             xalign = 0,
             valign = Gtk.Align.START
         };
+        description_label.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
 
         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);
@@ -84,6 +81,6 @@ public class Widgets.AppEntry : Gtk.ListBoxRow {
             items += _("Disabled");
         }
 
-        return "<span font_size=\"small\">%s</span>".printf (Markup.escape_text (string.joinv (", ", items)));
+        return string.joinv (", ", items);
     }
 }
diff --git a/src/Widgets/AppSettingsView.vala b/src/Widgets/AppSettingsView.vala
@@ -66,8 +66,9 @@ public class Widgets.AppSettingsView : Switchboard.SettingsPage {
         box.append (sound_option);
         box.append (remember_option);
 
-        child = box;
         add_css_class ("notifications");
+        child = box;
+        show_end_title_buttons = true;
 
         update_selected_app ();
 

diff --git a/src/Widgets/MainView.vala b/src/Widgets/MainView.vala
@@ -34,8 +34,7 @@ public class Widgets.MainView : Gtk.Widget {
             end_child = app_settings_view,
             resize_start_child = false,
             shrink_start_child = false,
-            shrink_end_child = false,
-            position = 240
+            shrink_end_child = false
         };
         main_widget.set_parent (this);
     }

diff --git a/src/Widgets/Sidebar.vala b/src/Widgets/Sidebar.vala
@@ -22,6 +22,10 @@ public class Widgets.Sidebar : Gtk.Box {
 
     private Gtk.SearchEntry search_entry;
 
+    class construct {
+        set_css_name ("settingssidebar");
+    }
+
     construct {
         search_entry = new Gtk.SearchEntry () {
             placeholder_text = _("Search Apps"),
@@ -32,9 +36,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,
@@ -45,37 +60,48 @@ public class Widgets.Sidebar : Gtk.Box {
         app_list.set_sort_func (sort_func);
 
         var scrolled_window = new Gtk.ScrolledWindow () {
-            child = app_list
+            child = app_list,
+            hscrollbar_policy = NEVER
         };
 
-        var do_not_disturb_label = new Gtk.Label (_("Do Not Disturb")) {
-            margin_start = 3
-        };
-        do_not_disturb_label.add_css_class (Granite.STYLE_CLASS_H4_LABEL);
+        var do_not_disturb_label = new Gtk.Label (_("Do Not Disturb"));
 
         var do_not_disturb_switch = new Gtk.Switch () {
-            margin_start = 6,
-            margin_top = 6,
-            margin_bottom = 6,
-            margin_end = 3
+            valign = CENTER
         };
 
         var footer = new Gtk.ActionBar ();
-        footer.add_css_class (Granite.STYLE_CLASS_FLAT);
         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,
+            bottom_bar_style = RAISED
+        };
+        toolbarview.add_top_bar (headerbar);
+        toolbarview.add_top_bar (search_revealer);
+        toolbarview.add_bottom_bar (footer);
+
+        append (toolbarview);
+        add_css_class (Granite.STYLE_CLASS_SIDEBAR);
 
         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");
+
+        search_revealer.notify["child-revealed"].connect (() => {
+            if (search_revealer.child_revealed) {
+                search_entry.grab_focus ();
+            } else {
+                search_entry.text = "";
+            }
+        });
+
         NotificationsPlug.notify_settings.bind (
             "do-not-disturb",
             do_not_disturb_switch,

diff --git a/src/meson.build b/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'),