secondary left sidebar

Bin/Data/Scripts/Editor.as

@@ -10,6 +10,7 @@
 #include "Scripts/Editor/EditorSettings.as"
 #include "Scripts/Editor/EditorPreferences.as"
 #include "Scripts/Editor/EditorToolBar.as"
+#include "Scripts/Editor/EditorSecondaryToolBar.as"
 #include "Scripts/Editor/EditorUI.as"
 #include "Scripts/Editor/EditorImport.as"
 

Bin/Data/Scripts/Editor/EditorHierarchyWindow.as

@@ -57,7 +57,7 @@ void CreateHierarchyWindow()
     ui.root.AddChild(hierarchyWindow);
     int height = Min(ui.root.height - 60, 500);
     hierarchyWindow.SetSize(300, height);
-    hierarchyWindow.SetPosition(10, 100);
+    hierarchyWindow.SetPosition(35, 100);
     hierarchyWindow.opacity = uiMaxOpacity;
     hierarchyWindow.BringToFront();
 

Bin/Data/Scripts/Editor/EditorSecondaryToolbar.as

@@ -0,0 +1,166 @@
+UIElement@ secondaryToolBar;
+
+void CreateSecondaryToolBar()
+{
+    secondaryToolBar = BorderImage("secondaryToolBar");
+    ui.root.AddChild(secondaryToolBar);
+
+    secondaryToolBar.style = "EditorToolBar";
+    secondaryToolBar.SetLayout(LM_VERTICAL);
+    secondaryToolBar.layoutSpacing = 4;
+    secondaryToolBar.layoutBorder = IntRect(4, 4, 4, 4);
+    secondaryToolBar.opacity = uiMaxOpacity;
+    secondaryToolBar.SetFixedSize(28, graphics.height);
+    secondaryToolBar.SetPosition(0, uiMenuBar.height+40);
+    secondaryToolBar.SetFixedHeight(graphics.height);
+
+    Button@ b = CreateSmallToolBarButton("Node");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateReplNode");  
+
+    b = CreateSmallToolBarButton("Node");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateLocalNode");
+
+    secondaryToolBar.AddChild(CreateSmallToolBarSpacer(3));
+
+    b = CreateSmallToolBarButton("Light");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent"); 
+
+    b = CreateSmallToolBarButton("Camera");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");     
+
+    b = CreateSmallToolBarButton("Zone");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent"); 
+
+    b = CreateSmallToolBarButton("StaticModel");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    b = CreateSmallToolBarButton("AnimatedModel");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    b = CreateSmallToolBarButton("BillboardSet");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    b = CreateSmallToolBarButton("ParticleEmitter");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    b = CreateSmallToolBarButton("Skybox");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    b = CreateSmallToolBarButton("Terrain");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    b = CreateSmallToolBarButton("Text3D");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    secondaryToolBar.AddChild(CreateSmallToolBarSpacer(3));
+
+    b = CreateSmallToolBarButton("SoundListener");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent"); 
+
+    b = CreateSmallToolBarButton("SoundSource3D");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    b = CreateSmallToolBarButton("SoundSource");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent"); 
+
+    secondaryToolBar.AddChild(CreateSmallToolBarSpacer(3));
+
+    b = CreateSmallToolBarButton("RigidBody");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    b = CreateSmallToolBarButton("CollisionShape");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    b = CreateSmallToolBarButton("Constraint");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent"); 
+
+    secondaryToolBar.AddChild(CreateSmallToolBarSpacer(3)); 
+
+    b = CreateSmallToolBarButton("AnimationController");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    b = CreateSmallToolBarButton("ScriptInstance");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    secondaryToolBar.AddChild(CreateSmallToolBarSpacer(3));     
+
+    b = CreateSmallToolBarButton("Navigable");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    b = CreateSmallToolBarButton("NavigationMesh");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    b = CreateSmallToolBarButton("OffMeshConnection");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent");
+
+    secondaryToolBar.AddChild(CreateSmallToolBarSpacer(3));
+
+    b = CreateSmallToolBarButton("NetworkPriority");
+    secondaryToolBar.AddChild(b);
+    SubscribeToEvent(b, "Released", "SmallToolBarCreateComponent"); 
+}
+
+Button@ CreateSmallToolBarButton(const String&in title)
+{
+    Button@ button = Button(title);
+    button.defaultStyle = uiStyle;
+    button.style = "ToolBarButton";
+    button.SetFixedSize(20, 20);
+    CreateSmallToolBarIcon(button);
+    return button;
+}
+
+void CreateSmallToolBarIcon(UIElement@ element)
+{
+    BorderImage@ icon = BorderImage("Icon");
+    icon.defaultStyle = iconStyle;
+    icon.style = element.name;
+    icon.SetFixedSize(14, 14);
+    element.AddChild(icon);
+}
+
+UIElement@ CreateSmallToolBarSpacer(uint width)
+{
+    UIElement@ spacer = UIElement();
+    spacer.SetFixedHeight(width);
+    return spacer;
+}
+
+void SmallToolBarCreateReplNode(StringHash eventType, VariantMap& eventData)
+{
+    CreateNode(REPLICATED);
+}
+
+void SmallToolBarCreateLocalNode(StringHash eventType, VariantMap& eventData)
+{
+    CreateNode(LOCAL);
+}
+
+void SmallToolBarCreateComponent(StringHash eventType, VariantMap& eventData)
+{
+    Button@ b = GetEventSender();
+    CreateComponent(b.name);
+}

Bin/Data/Scripts/Editor/EditorUI.as

@@ -57,6 +57,7 @@ void CreateUI()
     CreateCursor();
     CreateMenuBar();
     CreateToolBar();
+    CreateSecondaryToolBar();
     CreateQuickMenu();
     CreateHierarchyWindow();
     CreateAttributeInspectorWindow();
@@ -82,17 +83,20 @@ void ResizeUI()
     // Resize tool bar
     toolBar.SetFixedWidth(graphics.width);
 
+    // Resize secondary tool bar
+    secondaryToolBar.SetFixedHeight(graphics.height);
+
     // Relayout stats bar
     Font@ font = cache.GetResource("Font", "Fonts/Anonymous Pro.ttf");
     if (graphics.width >= 1200)
     {
-        SetupStatsBarText(editorModeText, font, 4, 64, HA_LEFT, VA_TOP);
+        SetupStatsBarText(editorModeText, font, 35, 64, HA_LEFT, VA_TOP);
         SetupStatsBarText(renderStatsText, font, -4, 64, HA_RIGHT, VA_TOP);
     }
     else
     {
-        SetupStatsBarText(editorModeText, font, 4, 64, HA_LEFT, VA_TOP);
-        SetupStatsBarText(renderStatsText, font, 4, 78, HA_LEFT, VA_TOP);
+        SetupStatsBarText(editorModeText, font, 35, 64, HA_LEFT, VA_TOP);
+        SetupStatsBarText(renderStatsText, font, 35, 78, HA_LEFT, VA_TOP);
     }
 
     // Relayout windows

Bin/Data/Scripts/Editor/EditorView.as

@@ -226,16 +226,16 @@ void CreateStatsBar()
 
     if (ui.root.width >= 1200)
     {
-        SetupStatsBarText(editorModeText, font, 4, 64, HA_LEFT, VA_TOP);
+        SetupStatsBarText(editorModeText, font, 35, 64, HA_LEFT, VA_TOP);
         SetupStatsBarText(renderStatsText, font, -4, 64, HA_RIGHT, VA_TOP);
     }
     else
     {
-        SetupStatsBarText(editorModeText, font, 4, 64, HA_LEFT, VA_TOP);
-        SetupStatsBarText(renderStatsText, font, 4, 78, HA_LEFT, VA_TOP);
+        SetupStatsBarText(editorModeText, font, 35, 64, HA_LEFT, VA_TOP);
+        SetupStatsBarText(renderStatsText, font, 35, 78, HA_LEFT, VA_TOP);
     }
 
-    SetupStatsBarText(cameraPosText, font, 0, 0, HA_LEFT, VA_BOTTOM);
+    SetupStatsBarText(cameraPosText, font, 35, -2, HA_LEFT, VA_BOTTOM);
 }
 
 void SetupStatsBarText(Text@ text, Font@ font, int x, int y, HorizontalAlignment hAlign, VerticalAlignment vAlign)