From 713b3d8842df307529b6d079680a83d3f8679ddf Mon Sep 17 00:00:00 2001 From: Erica Z Date: Mon, 28 Oct 2024 09:52:50 +0100 Subject: [PATCH] use adw box for more things --- src/ui/play_queue.blp | 6 +++--- src/ui/play_queue.vala | 2 +- src/ui/playbar.blp | 14 +++++++------- src/ui/playbar.vala | 2 +- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/ui/play_queue.blp b/src/ui/play_queue.blp index 962be6f..6f6f3f6 100644 --- a/src/ui/play_queue.blp +++ b/src/ui/play_queue.blp @@ -2,10 +2,10 @@ using Gtk 4.0; using Adw 1; using Gio 2.0; -template $UiPlayQueue: Box { +template $UiPlayQueue: Adw.Bin { name: "play-queue"; - Stack { + child: Stack { visible-child-name: bind $visible_child_name (template.playbin as <$Playbin>.play_queue as .n-items) as ; StackPage { @@ -43,5 +43,5 @@ template $UiPlayQueue: Box { } }; } - } + }; } diff --git a/src/ui/play_queue.vala b/src/ui/play_queue.vala index 223dafe..dbbf8ed 100644 --- a/src/ui/play_queue.vala +++ b/src/ui/play_queue.vala @@ -112,7 +112,7 @@ class Ui.PlayQueueSong : Gtk.Box { } [GtkTemplate (ui = "/eu/callcc/audrey/ui/play_queue.ui")] -public class Ui.PlayQueue : Gtk.Box { +public class Ui.PlayQueue : Adw.Bin { private weak Playbin _playbin; public Playbin playbin { get { return _playbin; } diff --git a/src/ui/playbar.blp b/src/ui/playbar.blp index 83ef6c6..6ced696 100644 --- a/src/ui/playbar.blp +++ b/src/ui/playbar.blp @@ -1,12 +1,12 @@ using Gtk 4.0; +using Adw 1; -template $UiPlaybar: Box { - styles [ - "toolbar", - ] - - CenterBox { +template $UiPlaybar: Adw.Bin { + child: CenterBox { hexpand: true; + styles [ + "toolbar", + ] [start] Box { @@ -168,5 +168,5 @@ template $UiPlaybar: Box { }; } } - } + }; } diff --git a/src/ui/playbar.vala b/src/ui/playbar.vala index 0b38644..a92bb7b 100644 --- a/src/ui/playbar.vala +++ b/src/ui/playbar.vala @@ -1,5 +1,5 @@ [GtkTemplate (ui = "/eu/callcc/audrey/ui/playbar.ui")] -class Ui.Playbar : Gtk.Box { +class Ui.Playbar : Adw.Bin { public Subsonic.Song? song { get; set; } public Gdk.Paintable? playing_cover_art { get; set; } public weak Playbin playbin { get; set; }