[dconf-editor] Clean a bit center_widget.

[Arnaud B. <arnaudb src gnome org>]

commit 0c5b0a9ff5958fde07d354798131a20381f12f44
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Thu Dec 6 18:28:20 2018 +0100

    Clean a bit center_widget.

 editor/browser-headerbar.ui   | 22 +++++-----------------
 editor/browser-headerbar.vala | 22 ++++++----------------
 editor/browser-window.vala    |  2 ++
 editor/dconf-window.vala      | 10 ++++++++++
 4 files changed, 23 insertions(+), 33 deletions(-)
---
diff --git a/editor/browser-headerbar.ui b/editor/browser-headerbar.ui
index e96cfa9..b8bcbe1 100644
--- a/editor/browser-headerbar.ui
+++ b/editor/browser-headerbar.ui
@@ -79,28 +79,16 @@
               </object>
             </child>
             <child>
-              <object class="GtkStack" id="bookmarks_stack">
+              <object class="GtkLabel" id="title_label">
                 <property name="visible">True</property>
-                <property name="hhomogeneous">False</property>
-                <child>
-                  <object class="GtkLabel" id="bookmarks_label">
-                    <property name="visible">True</property>
-                    <property name="label" translatable="yes">Bookmarks</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="BookmarksController" id="bookmarks_controller">
-                    <property name="visible">True</property>
-                    <property name="hexpand">False</property>
-                    <property name="show-rows-size-button">False</property>
-                    <property name="controller-action-prefix">bmk</property>
-                  </object>
-                </child>
               </object>
             </child>
             <child>
-              <object class="GtkLabel" id="title_label">
+              <object class="BookmarksController" id="bookmarks_controller">
                 <property name="visible">True</property>
+                <property name="hexpand">True</property>
+                <property name="show-rows-size-button">False</property>
+                <property name="controller-action-prefix">bmk</property>
               </object>
             </child>
           </object>
diff --git a/editor/browser-headerbar.vala b/editor/browser-headerbar.vala
index 29383ec..b131fba 100644
--- a/editor/browser-headerbar.vala
+++ b/editor/browser-headerbar.vala
@@ -215,7 +215,6 @@ private class BrowserHeaderBar : AdaptativeHeaderBar, AdaptativeWidget
         info_button.hide ();
         go_back_button.set_action_name ("browser.hide-in-window-about");
         go_back_button.show ();
-        bookmarks_stack.hexpand = false;    // hack 1/7
         title_label.set_label (_("About"));
         title_stack.set_visible_child (title_label);
     }
@@ -224,9 +223,8 @@ private class BrowserHeaderBar : AdaptativeHeaderBar, AdaptativeWidget
         requires (in_window_about == true)
     {
         go_back_button.hide ();
-        bookmarks_stack.hexpand = false;    // hack 2/7
-        title_stack.set_visible_child (path_widget);
         in_window_about = false;
+        title_stack.set_visible_child (path_widget);
         if (disable_action_bar)
             ltr_right_separator.show ();
         info_button.show ();
@@ -317,7 +315,6 @@ private class BrowserHeaderBar : AdaptativeHeaderBar, AdaptativeWidget
         modifications_actions_button.show ();
         go_back_button.set_action_name ("ui.hide-in-window-modifications");
         go_back_button.show ();
-        bookmarks_stack.hexpand = false;    // hack 3/7
         title_label.set_label (_("Pending"));
         title_stack.set_visible_child (title_label);
     }
@@ -334,9 +331,8 @@ private class BrowserHeaderBar : AdaptativeHeaderBar, AdaptativeWidget
         }
         if (!disable_popovers)
             bookmarks_button.show ();
-        bookmarks_stack.hexpand = false;    // hack 4/7
-        title_stack.set_visible_child (path_widget);
         in_window_modifications = false;
+        title_stack.set_visible_child (path_widget);
         info_button.show ();
         if (path_widget.search_mode_enabled)
             path_widget.entry_grab_focus_without_selecting ();
@@ -354,8 +350,6 @@ private class BrowserHeaderBar : AdaptativeHeaderBar, AdaptativeWidget
     * * in-window bookmarks
     \*/
 
-    [GtkChild] private Stack                bookmarks_stack;
-    [GtkChild] private Label                bookmarks_label;
     [GtkChild] private BookmarksController  bookmarks_controller;
 
     bool in_window_bookmarks = false;
@@ -371,9 +365,8 @@ private class BrowserHeaderBar : AdaptativeHeaderBar, AdaptativeWidget
         update_modifications_button ();
         info_button.hide ();
         ltr_left_separator.hide ();
-        bookmarks_stack.hexpand = false;    // hack 5/7
-        title_stack.set_visible_child (bookmarks_stack);
-        bookmarks_stack.set_visible_child (bookmarks_label);
+        title_label.set_label (_("Bookmarks"));
+        title_stack.set_visible_child (title_label);
         go_back_button.set_action_name ("ui.hide-in-window-bookmarks");
         go_back_button.show ();
     }
@@ -384,10 +377,8 @@ private class BrowserHeaderBar : AdaptativeHeaderBar, AdaptativeWidget
         go_back_button.hide ();
         ltr_left_separator.hide ();
         in_window_bookmarks = false;
-        update_modifications_button ();
-        bookmarks_stack.hexpand = false;    // hack 6/7
         title_stack.set_visible_child (path_widget);
-        bookmarks_stack.set_visible_child (bookmarks_label);
+        update_modifications_button ();
         info_button.show ();
         update_hamburger_menu ();
         if (path_widget.search_mode_enabled)
@@ -397,9 +388,8 @@ private class BrowserHeaderBar : AdaptativeHeaderBar, AdaptativeWidget
     internal void edit_in_window_bookmarks ()
         requires (in_window_bookmarks == true)
     {
-        bookmarks_stack.hexpand = true;     // hack 7/7
         ltr_left_separator.show ();
-        bookmarks_stack.set_visible_child (bookmarks_controller);
+        title_stack.set_visible_child (bookmarks_controller);
     }
 
     /*\
diff --git a/editor/browser-window.vala b/editor/browser-window.vala
index f70844e..92b6c22 100644
--- a/editor/browser-window.vala
+++ b/editor/browser-window.vala
@@ -745,6 +745,8 @@ private abstract class BrowserWindow : AdaptativeWindow, AdaptativeWidget
     private inline void show_in_window_about ()
         requires (in_window_about == false)
     {
+        close_in_window_panels ();
+
         in_window_about = true;
         headerbar.show_in_window_about ();
         browser_view.show_in_window_about ();
diff --git a/editor/dconf-window.vala b/editor/dconf-window.vala
index f5ee82e..85ea6e0 100644
--- a/editor/dconf-window.vala
+++ b/editor/dconf-window.vala
@@ -497,6 +497,11 @@ private class DConfWindow : BrowserWindow
 
     private void show_in_window_bookmarks (/* SimpleAction action, Variant? path_variant */)
     {
+        if (browser_view.in_window_modifications == true)
+            hide_in_window_modifications ();
+        else if (in_window_about)
+            hide_in_window_about ();
+
         headerbar.show_in_window_bookmarks ();
         string [] bookmarks = headerbar.get_bookmarks ();
         browser_view.show_in_window_bookmarks (bookmarks);
@@ -514,6 +519,11 @@ private class DConfWindow : BrowserWindow
 
     private void show_in_window_modifications (/* SimpleAction action, Variant? path_variant */)
     {
+        if (browser_view.in_window_bookmarks == true)
+            hide_in_window_bookmarks ();
+        else if (in_window_about)
+            hide_in_window_about ();
+
         headerbar.show_in_window_modifications ();
         browser_view.show_in_window_modifications ();
     }