From 247bda729127cdbf1643b03424b098abfbc1312e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Sun, 8 Jan 2023 09:51:14 -0800
Subject: [PATCH] Put the ProjectChooserButton inside the sidebar

---
 src/MainWindow.vala        |  4 ++--
 src/Widgets/HeaderBar.vala | 12 ------------
 src/Widgets/Sidebar.vala   |  8 ++++++++
 3 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index e986f28f6b..7cf54d1d72 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -271,7 +271,6 @@ namespace Scratch {
                     break;
             }
 
-            sidebar.bind_property ("visible", toolbar.choose_project_revealer, "reveal-child");
             // Show/Hide widgets
             show_all ();
 
@@ -294,7 +293,7 @@ namespace Scratch {
             toolbar = new Scratch.Widgets.HeaderBar ();
             toolbar.title = title;
 
-            toolbar.choose_project_button.project_chosen.connect (() => {
+            sidebar.choose_project_button.project_chosen.connect (() => {
                 folder_manager_view.collapse_other_projects ();
             });
 
@@ -449,6 +448,7 @@ namespace Scratch {
                     title = doc.get_basename ();
 
                     toolbar.set_document_focus (doc);
+                    sidebar.choose_project_button.set_document (doc);
                     folder_manager_view.select_path (doc.file.get_path ());
 
                     // Set actions sensitive property
diff --git a/src/Widgets/HeaderBar.vala b/src/Widgets/HeaderBar.vala
index 724b0fc38b..460227d946 100644
--- a/src/Widgets/HeaderBar.vala
+++ b/src/Widgets/HeaderBar.vala
@@ -27,8 +27,6 @@ namespace Scratch.Widgets {
         public Gtk.ToggleButton find_button;
         public Gtk.Button templates_button;
         public Code.FormatBar format_bar;
-        public Code.ChooseProjectButton choose_project_button;
-        public Gtk.Revealer choose_project_revealer;
 
         private const string STYLE_SCHEME_HIGH_CONTRAST = "classic";
         private const string STYLE_SCHEME_LIGHT = "elementary-light";
@@ -44,14 +42,6 @@ namespace Scratch.Widgets {
         construct {
             var app_instance = (Scratch.Application) GLib.Application.get_default ();
 
-            choose_project_revealer = new Gtk.Revealer () {
-                transition_type = Gtk.RevealerTransitionType.SLIDE_LEFT
-            };
-            choose_project_button = new Code.ChooseProjectButton () {
-                valign = Gtk.Align.CENTER
-            };
-            choose_project_revealer.add (choose_project_button);
-
             var open_button = new Gtk.Button.from_icon_name ("document-open", Gtk.IconSize.LARGE_TOOLBAR);
             open_button.action_name = MainWindow.ACTION_PREFIX + MainWindow.ACTION_OPEN;
             open_button.tooltip_markup = Granite.markup_accel_tooltip (
@@ -218,7 +208,6 @@ namespace Scratch.Widgets {
             };
             set_custom_title (format_bar);
 
-            pack_start (choose_project_revealer);
             pack_start (open_button);
             pack_start (templates_button);
             pack_start (save_button);
@@ -363,7 +352,6 @@ namespace Scratch.Widgets {
 
         public void set_document_focus (Scratch.Services.Document doc) {
             format_bar.set_document (doc);
-            choose_project_button.set_document (doc);
         }
     }
 }
diff --git a/src/Widgets/Sidebar.vala b/src/Widgets/Sidebar.vala
index f7fbfabf18..0bf18d0d53 100644
--- a/src/Widgets/Sidebar.vala
+++ b/src/Widgets/Sidebar.vala
@@ -19,11 +19,18 @@
 
 public class Code.Sidebar : Gtk.Grid {
     public Gtk.Stack stack { get; private set; }
+    public Code.ChooseProjectButton choose_project_button { get; private set; }
+
     private Gtk.StackSwitcher stack_switcher;
+
     construct {
         orientation = Gtk.Orientation.VERTICAL;
         get_style_context ().add_class (Gtk.STYLE_CLASS_SIDEBAR);
 
+        choose_project_button = new Code.ChooseProjectButton () {
+            margin = 6
+        };
+
         stack = new Gtk.Stack ();
         stack.transition_type = Gtk.StackTransitionType.SLIDE_LEFT_RIGHT;
 
@@ -63,6 +70,7 @@ public class Code.Sidebar : Gtk.Grid {
         actionbar.add (add_folder_button);
         actionbar.pack_end (project_more_button);
 
+        add (choose_project_button);
         add (stack_switcher);
         add (stack);
         add (actionbar);