[gnome-characters/bilelmoussaoui/gtk4: 2/2] character dialog: use a leaflet for the whole view

[Bilal Elmoussaoui <bilelmoussaoui src gnome org>]

commit 76b3166b1b1c0b65c9e22dfce0cb8101398835c8
Author: Bilal Elmoussaoui <bil elmoussaoui gmail com>
Date:   Thu Nov 25 09:48:47 2021 +0100

    character dialog: use a leaflet for the whole view

 data/character_dialog.ui | 74 ++++++++++++++++++++++++++++--------------------
 src/characterDialog.js   |  4 +--
 2 files changed, 44 insertions(+), 34 deletions(-)
---
diff --git a/data/character_dialog.ui b/data/character_dialog.ui
index ba43591..adf2be1 100644
--- a/data/character_dialog.ui
+++ b/data/character_dialog.ui
@@ -6,33 +6,23 @@
     <child>
       <object class="AdwToastOverlay" id="toastOverlay">
         <property name="child">
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
+          <object class="AdwLeaflet" id="leaflet">
+            <property name="can-unfold">false</property>
+            <property name="can-navigate-back">true</property>
             <child>
-              <object class="GtkHeaderBar">
-                <child type="start">
-                  <object class="GtkRevealer" id="revealer">
-                    <property name="transition-type">crossfade</property>
+              <object class="AdwLeafletPage">
+                <property name="name">character</property>
+                <property name="child">
+                  <object class="GtkBox">
+                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkButton">
-                        <property name="icon-name">go-previous-symbolic</property>
-                        <property name="action-name">character.go-back</property>
+                      <object class="GtkHeaderBar">
+                        <property name="title-widget">
+                          <object class="AdwWindowTitle" id="windowTitle" />
+                        </property>
                       </object>
                     </child>
-                  </object>
-                </child>
-                <property name="title-widget">
-                  <object class="AdwWindowTitle" id="windowTitle" />
-                </property>
-              </object>
-            </child>
-            <child>
-              <object class="AdwLeaflet" id="leaflet">
-                <property name="can-unfold">false</property>
-                <child>
-                  <object class="AdwLeafletPage">
-                    <property name="name">character</property>
-                    <property name="child">
+                    <child>
                       <object class="GtkBox">
                         <property name="orientation">vertical</property>
                         <property name="halign">fill</property>
@@ -130,13 +120,35 @@
                           </object>
                         </child>
                       </object>
-                    </property>
+                    </child>
                   </object>
-                </child>
-                <child>
-                  <object class="AdwLeafletPage">
-                    <property name="name">related</property>
-                    <property name="child">
+                </property>
+              </object>
+            </child>
+            <child>
+              <object class="AdwLeafletPage">
+                <property name="name">related</property>
+                <property name="child">
+                  <object class="GtkBox">
+                    <property name="orientation">vertical</property>
+                    <child>
+                      <object class="GtkHeaderBar">
+                        <child type="start">
+                          <object class="GtkButton">
+                            <property name="icon-name">go-previous-symbolic</property>
+                            <property name="action-name">character.go-back</property>
+                          </object>
+                        </child>
+                        <property name="title-widget">
+                          <object class="AdwWindowTitle">
+                            <binding name="title">
+                              <lookup name="title">windowTitle</lookup>
+                            </binding>
+                          </object>
+                        </property>
+                      </object>
+                    </child>
+                    <child>
                       <object class="GtkScrolledWindow" id="related-scrolled">
                         <property name="hscrollbar-policy">never</property>
                         <property name="vexpand">True</property>
@@ -159,9 +171,9 @@
                           </object>
                         </child>
                       </object>
-                    </property>
+                    </child>
                   </object>
-                </child>
+                </property>
               </object>
             </child>
           </object>
diff --git a/src/characterDialog.js b/src/characterDialog.js
index 795c535..6b6c9d7 100644
--- a/src/characterDialog.js
+++ b/src/characterDialog.js
@@ -30,7 +30,7 @@ var CharacterDialog = GObject.registerClass({
         'leaflet', 'characterStack',
         'characterLabel', 'missingLabel', 'detailLabel',
         'seeAlsoRow', 'relatedListbox',
-        'windowTitle', 'revealer', 'toastOverlay',
+        'windowTitle', 'toastOverlay',
     ],
 }, class CharacterDialog extends Adw.Window {
     _init(character, fontDescription) {
@@ -137,12 +137,10 @@ var CharacterDialog = GObject.registerClass({
     }
 
     _seeMore() {
-        this._revealer.reveal_child = true;
         this._leaflet.navigate(Adw.NavigationDirection.FORWARD);
     }
 
     _seeCharacter() {
-        this._revealer.reveal_child = false;
         this._leaflet.navigate(Adw.NavigationDirection.BACK);
     }