From e0e044c9a38a5263ef2c673a93a6dbf221f430c0 Mon Sep 17 00:00:00 2001 From: AkshayWarrier Date: Thu, 10 Aug 2023 02:47:57 +0530 Subject: [PATCH 1/4] library: Add Navigation Split View entry --- .../demos/Navigation Split View/main.blp | 64 +++++++++++++++++++ .../demos/Navigation Split View/main.json | 6 ++ 2 files changed, 70 insertions(+) create mode 100644 src/Library/demos/Navigation Split View/main.blp create mode 100644 src/Library/demos/Navigation Split View/main.json diff --git a/src/Library/demos/Navigation Split View/main.blp b/src/Library/demos/Navigation Split View/main.blp new file mode 100644 index 000000000..c43011077 --- /dev/null +++ b/src/Library/demos/Navigation Split View/main.blp @@ -0,0 +1,64 @@ +using Gtk 4.0; +using Adw 1; + +Adw.Window { + width-request: 360; + height-request: 200; + default-width: 640; + default-height: 480; + + Adw.Breakpoint { + condition ("max-width: 500px") + setters { + split_view.collapsed: true; + button.visible: true; + } + } + + content: Adw.NavigationSplitView split_view { + sidebar: Adw.NavigationPage { + title: "Sidebar"; + child: Adw.ToolbarView { + + [top] + Adw.HeaderBar { + show-title: false; + } + + content: Adw.StatusPage { + title: _("Sidebar"); + + Button button { + visible: false; + halign: center; + label: _("Open Content"); + action-name: "navigation.push"; + action-target: "'content'"; + styles ["pill"] + } + }; + }; + }; + + content: Adw.NavigationPage { + title: "Content"; + tag: "content"; + child: Adw.ToolbarView { + + [top] + Adw.HeaderBar { + show-title: false; + } + + content: Adw.StatusPage { + title: _("Navigation Split View"); + + LinkButton { + label: "API Reference"; + uri: "https://gnome.pages.gitlab.gnome.org/libadwaita/doc/main/class.NavigationSplitView.html"; + } + }; + }; + }; + }; +} diff --git a/src/Library/demos/Navigation Split View/main.json b/src/Library/demos/Navigation Split View/main.json new file mode 100644 index 000000000..b541b06d9 --- /dev/null +++ b/src/Library/demos/Navigation Split View/main.json @@ -0,0 +1,6 @@ +{ + "category": "user_interface", + "description": "A widget presenting sidebar and content side by side or as a navigation view.", + "panels": ["ui", "preview"], + "autorun": true +} From bbf9b91d5fa659ae51c3d8d3f60c01d574e7db93 Mon Sep 17 00:00:00 2001 From: AkshayWarrier Date: Thu, 10 Aug 2023 11:38:27 +0530 Subject: [PATCH 2/4] Navigation Split View: Replicate Adw Demo --- src/Library/demos/Navigation Split View/main.blp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/Library/demos/Navigation Split View/main.blp b/src/Library/demos/Navigation Split View/main.blp index c43011077..c189b8750 100644 --- a/src/Library/demos/Navigation Split View/main.blp +++ b/src/Library/demos/Navigation Split View/main.blp @@ -8,7 +8,7 @@ Adw.Window { default-height: 480; Adw.Breakpoint { - condition ("max-width: 500px") + condition ("max-width: 400sp") setters { split_view.collapsed: true; button.visible: true; @@ -22,6 +22,7 @@ Adw.Window { [top] Adw.HeaderBar { + decoration-layout: "icon:close"; show-title: false; } @@ -47,11 +48,12 @@ Adw.Window { [top] Adw.HeaderBar { + decoration-layout: "icon:close"; show-title: false; } content: Adw.StatusPage { - title: _("Navigation Split View"); + title: _("Content"); LinkButton { label: "API Reference"; From c6dd2f8700dc5a686b9d8f3c594926d501743b84 Mon Sep 17 00:00:00 2001 From: AkshayWarrier Date: Fri, 11 Aug 2023 11:36:41 +0530 Subject: [PATCH 3/4] Navigation Split View: Changes from code review --- src/Library/demos/Navigation Split View/main.blp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Library/demos/Navigation Split View/main.blp b/src/Library/demos/Navigation Split View/main.blp index c189b8750..3c307ffd9 100644 --- a/src/Library/demos/Navigation Split View/main.blp +++ b/src/Library/demos/Navigation Split View/main.blp @@ -18,11 +18,11 @@ Adw.Window { content: Adw.NavigationSplitView split_view { sidebar: Adw.NavigationPage { title: "Sidebar"; + tag: "sidebar"; child: Adw.ToolbarView { [top] Adw.HeaderBar { - decoration-layout: "icon:close"; show-title: false; } @@ -32,6 +32,7 @@ Adw.Window { Button button { visible: false; halign: center; + can-shrink: true; label: _("Open Content"); action-name: "navigation.push"; action-target: "'content'"; @@ -48,7 +49,6 @@ Adw.Window { [top] Adw.HeaderBar { - decoration-layout: "icon:close"; show-title: false; } From a7dafa86055a9967ac35380aef65828e4e2784f5 Mon Sep 17 00:00:00 2001 From: AkshayWarrier Date: Fri, 11 Aug 2023 11:40:30 +0530 Subject: [PATCH 4/4] Navigation Split View: Update main.json --- src/Library/demos/Navigation Split View/main.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Library/demos/Navigation Split View/main.json b/src/Library/demos/Navigation Split View/main.json index b541b06d9..30555a9a0 100644 --- a/src/Library/demos/Navigation Split View/main.json +++ b/src/Library/demos/Navigation Split View/main.json @@ -1,5 +1,5 @@ { - "category": "user_interface", + "category": "navigation", "description": "A widget presenting sidebar and content side by side or as a navigation view.", "panels": ["ui", "preview"], "autorun": true