From 2218da1c84282dcaffb4101dbf6278c262f30281 Mon Sep 17 00:00:00 2001 From: Bruce Cowan <bruce@bcowan.me.uk> Date: Sun, 8 Jan 2023 15:27:21 +0000 Subject: [PATCH] UI hierarchy reorganisation --- data/gtk/window.blp | 98 ++++++++++++++++++++++----------------------- 1 file changed, 47 insertions(+), 51 deletions(-) diff --git a/data/gtk/window.blp b/data/gtk/window.blp index 8bca80b..dd91440 100644 --- a/data/gtk/window.blp +++ b/data/gtk/window.blp @@ -36,66 +36,62 @@ template RugbyAppWindow : Adw.ApplicationWindow { } } + Revealer { + halign: center; + margin-top: 6; + reveal-child: bind filter_toggle.active; + transition-type: swing_down; + + SpinButton tryspin { + adjustment: Adjustment { + step-increment: 1; + lower: 0; + upper: 40; + }; + focusable: true; + tooltip-text: "Tries"; + + value-changed => try_spin_value_changed_cb(); + } + } + Adw.Clamp { - maximum-size: 600; - - Box { - orientation: vertical; - - Revealer { - halign: center; - margin-top: 6; - reveal-child: bind filter_toggle.active; - transition-type: swing_down; - - SpinButton tryspin { - adjustment: Adjustment { - step-increment: 1; - lower: 0; - upper: 40; - }; - focusable: true; - tooltip-text: "Tries"; - - value-changed => try_spin_value_changed_cb(); - } - } + maximum-size: 500; - Stack stack { - StackPage { - name: "empty_page"; + Stack stack { + StackPage { + name: "empty_page"; - child: Adw.StatusPage { - icon-name: "list"; - title: "No possibilities"; - }; - } + child: Adw.StatusPage { + icon-name: "list"; + title: "No possibilities"; + }; + } - StackPage { - name: "list_page"; + StackPage { + name: "list_page"; - child: ScrolledWindow { - vexpand: true; + child: ScrolledWindow { + vexpand: true; - ListView listview { - styles ["rich-list"] + ListView listview { + styles ["rich-list"] - factory: BuilderListItemFactory { - resource: "/uk/me/bcowan/Rugby/gtk/score-item.ui"; - }; - model: NoSelection { - model: FilterListModel { - filter: CustomFilter try_filter {}; - model: .RugbyListStore list_store { - score: bind scorespin.value; - }; - - items-changed => list_store_items_changed_cb(); + factory: BuilderListItemFactory { + resource: "/uk/me/bcowan/Rugby/gtk/score-item.ui"; + }; + model: NoSelection { + model: FilterListModel { + filter: CustomFilter try_filter {}; + model: .RugbyListStore list_store { + score: bind scorespin.value; }; + + items-changed => list_store_items_changed_cb(); }; - } - }; - } + }; + } + }; } } } -- GitLab