UI: show workspace panel last & use a parent panel

2 files changed, 15 insertions, 2 deletions

diff --git a/release/scripts/startup/bl_ui/__init__.py b/release/scripts/startup/bl_ui/__init__.py
index 89aed37f055..d88cee4424b 100644
--- a/release/scripts/startup/bl_ui/__init__.py
+++ b/release/scripts/startup/bl_ui/__init__.py
@@ -43,7 +43,6 @@ _modules = [
     "properties_data_shaderfx",
     "properties_data_lightprobe",
     "properties_data_speaker",
-    "properties_data_workspace",
     "properties_mask_common",
     "properties_material",
     "properties_material_gpencil",
@@ -91,6 +90,9 @@ _modules = [
     "space_userpref",
     "space_view3d",
     "space_view3d_toolbar",
+
+    # XXX, keep last so panels show after all other tool options.
+    "properties_data_workspace",
 ]
 
 import bpy
diff --git a/release/scripts/startup/bl_ui/properties_data_workspace.py b/release/scripts/startup/bl_ui/properties_data_workspace.py
index f137c7401c2..b01ed640b2c 100644
--- a/release/scripts/startup/bl_ui/properties_data_workspace.py
+++ b/release/scripts/startup/bl_ui/properties_data_workspace.py
@@ -31,9 +31,17 @@ class WorkSpaceButtonsPanel:
     bl_context = ".workspace"
 
 
+class WORKSPACE_PT_main(WorkSpaceButtonsPanel, Panel):
+    bl_label = "Workspace"
+    bl_options = {'DEFAULT_CLOSED'}
+
+    def draw(self, context):
+        pass
+
+
 class WORKSPACE_PT_owner_ids(WorkSpaceButtonsPanel, Panel):
     bl_label = "Workspace Add-ons"
-    bl_options = {'DEFAULT_CLOSED'}
+    bl_parent_id = "WORKSPACE_PT_main"
 
     def draw_header(self, context):
         workspace = context.workspace
@@ -86,11 +94,14 @@ class WORKSPACE_PT_owner_ids(WorkSpaceButtonsPanel, Panel):
 
 
 class WORKSPACE_PT_custom_props(WorkSpaceButtonsPanel, PropertyPanel, Panel):
+    bl_parent_id = "WORKSPACE_PT_main"
+
     _context_path = "workspace"
     _property_type = bpy.types.WorkSpace
 
 
 classes = (
+    WORKSPACE_PT_main,
     WORKSPACE_PT_owner_ids,
     WORKSPACE_PT_custom_props,
 )