[gnome-builder/wip/gtk4-port: 930/1774] plugins: fix panel positioning for start panel

[Christian Hergert <chergert src gnome org>]

commit dc4c7a2a0bbd4b873cba69bae997fbebd42d41ed
Author: Christian Hergert <chergert redhat com>
Date:   Sun May 8 23:02:16 2022 -0700

    plugins: fix panel positioning for start panel
    
    I'd really like to fix the issue where todo is having to depend on
    project-tree still.

 src/plugins/buildui/gbp-buildui-workspace-addin.c           | 2 +-
 src/plugins/project-tree/gbp-project-tree-workspace-addin.c | 4 +++-
 src/plugins/todo/gbp-todo-workspace-addin.c                 | 1 +
 src/plugins/todo/todo.plugin                                | 1 +
 4 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/src/plugins/buildui/gbp-buildui-workspace-addin.c 
b/src/plugins/buildui/gbp-buildui-workspace-addin.c
index 2b05b9b4b..317859e18 100644
--- a/src/plugins/buildui/gbp-buildui-workspace-addin.c
+++ b/src/plugins/buildui/gbp-buildui-workspace-addin.c
@@ -351,7 +351,7 @@ gbp_buildui_workspace_addin_load (IdeWorkspaceAddin *addin,
 
   pane_position = ide_panel_position_new ();
   ide_panel_position_set_edge (pane_position, PANEL_DOCK_POSITION_START);
-  ide_panel_position_set_depth (pane_position, 2);
+  ide_panel_position_set_depth (pane_position, 1);
 
   self->pane = g_object_new (GBP_TYPE_BUILDUI_PANE, NULL);
   ide_workspace_add_pane (workspace, IDE_PANE (self->pane), pane_position);
diff --git a/src/plugins/project-tree/gbp-project-tree-workspace-addin.c 
b/src/plugins/project-tree/gbp-project-tree-workspace-addin.c
index 0aabc1473..bc45bff3f 100644
--- a/src/plugins/project-tree/gbp-project-tree-workspace-addin.c
+++ b/src/plugins/project-tree/gbp-project-tree-workspace-addin.c
@@ -56,6 +56,8 @@ gbp_project_tree_workspace_addin_load (IdeWorkspaceAddin *addin,
   ide_panel_position_set_depth (position, 0);
 
   ide_workspace_add_pane (workspace, IDE_PANE (self->pane), position);
+
+  panel_widget_raise (PANEL_WIDGET (self->pane));
 }
 
 static void
@@ -78,7 +80,7 @@ workspace_addin_iface_init (IdeWorkspaceAddinInterface *iface)
 }
 
 G_DEFINE_FINAL_TYPE_WITH_CODE (GbpProjectTreeWorkspaceAddin, gbp_project_tree_workspace_addin, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (IDE_TYPE_WORKSPACE_ADDIN, workspace_addin_iface_init))
+                               G_IMPLEMENT_INTERFACE (IDE_TYPE_WORKSPACE_ADDIN, workspace_addin_iface_init))
 
 static void
 gbp_project_tree_workspace_addin_class_init (GbpProjectTreeWorkspaceAddinClass *klass)
diff --git a/src/plugins/todo/gbp-todo-workspace-addin.c b/src/plugins/todo/gbp-todo-workspace-addin.c
index a0e019fd9..da52ae8cb 100644
--- a/src/plugins/todo/gbp-todo-workspace-addin.c
+++ b/src/plugins/todo/gbp-todo-workspace-addin.c
@@ -148,6 +148,7 @@ gbp_todo_workspace_addin_load (IdeWorkspaceAddin *addin,
 
   position = ide_panel_position_new ();
   ide_panel_position_set_edge (position, PANEL_DOCK_POSITION_START);
+  ide_panel_position_set_row (position, 0);
   ide_panel_position_set_depth (position, 2);
 
   ide_workspace_add_pane (workspace, IDE_PANE (self->panel), position);
diff --git a/src/plugins/todo/todo.plugin b/src/plugins/todo/todo.plugin
index 73af9097b..e47783390 100644
--- a/src/plugins/todo/todo.plugin
+++ b/src/plugins/todo/todo.plugin
@@ -2,6 +2,7 @@
 Authors=Christian Hergert <christian hergert me>
 Builtin=true
 Copyright=Copyright © 2015-2018 Christian Hergert
+Depends=project-tree;
 Description=Find and present To-Do items from source code
 Embedded=_gbp_todo_register_types
 Module=todo