diff --git a/README.md b/README.md index 6fc293d8..19a1c464 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ You'll need the following dependencies: * gio-2.0 (>=2.74) +* libadwaita-1-dev * libdbus-1-dev * libswitchboard-3-dev * libgranite-7-dev diff --git a/meson.build b/meson.build index 8ff0dd20..5ba7f846 100644 --- a/meson.build +++ b/meson.build @@ -27,6 +27,7 @@ conf_file = configure_file( configuration: conf_data ) +adw_dep = dependency('libadwaita-1') dbus_dep = dependency('dbus-1') glib_dep = dependency('glib-2.0') gio_dep = dependency('gio-2.0', version: '>=2.74') diff --git a/src/Plug.vala b/src/Plug.vala index c65dae9f..c65ef2b2 100644 --- a/src/Plug.vala +++ b/src/Plug.vala @@ -21,6 +21,7 @@ namespace Power { private GLib.Settings settings; public class Plug : Switchboard.Plug { + private Gtk.Box box; private MainView main_view; public Plug () { @@ -39,11 +40,24 @@ namespace Power { } public override Gtk.Widget get_widget () { - if (main_view == null) { + if (box == null) { Gtk.IconTheme.get_for_display (Gdk.Display.get_default ()).add_resource_path ("/io/elementary/settings/power"); - main_view = new MainView (); + + var headerbar = new Adw.HeaderBar () { + show_title = false + }; + headerbar.add_css_class (Granite.STYLE_CLASS_FLAT); + + main_view = new MainView () { + vexpand = true + }; + + box = new Gtk.Box (VERTICAL, 0); + box.append (headerbar); + box.append (main_view); } - return main_view; + + return box; } public override void shown () { diff --git a/src/meson.build b/src/meson.build index c951d553..fa0a45fa 100644 --- a/src/meson.build +++ b/src/meson.build @@ -23,6 +23,7 @@ shared_module( conf_file, interfaces_file, dependencies: [ + adw_dep, glib_dep, gio_dep, dependency('gobject-2.0'),