Improved inspector and menu bar look

BansheeEditor/Include/BsGUIMenuBar.h

@@ -22,6 +22,7 @@ namespace BansheeEngine
 			WString name;
 			GUIMenu* menu;
 			GUIButton* button;
+			GUIFixedSpace* space;
 		};
 
 	public:
@@ -77,6 +78,7 @@ namespace BansheeEngine
 		void removeMenuItem(const WString& path);
 	private:
 		static const UINT32 NUM_ELEMENTS_AFTER_CONTENT;
+		static const UINT32 ELEMENT_SPACING;
 
 		RenderWindow* mParentWindow;
 		GUIWidget* mParentWidget;

BansheeEditor/Source/BsGUIFoldout.cpp

@@ -122,7 +122,7 @@ namespace BansheeEngine
 		optimalsize.x += labelOptimalSize.x;
 		optimalsize.y = std::max(optimalsize.y, labelOptimalSize.y);
 
-		return optimalsize;
+		return mDimensions.calculateSizeRange(optimalsize).optimal;
 	}
 
 	void GUIFoldout::styleUpdated()

BansheeEditor/Source/BsGUIMenuBar.cpp

@@ -17,6 +17,7 @@
 namespace BansheeEngine
 {
 	const UINT32 GUIMenuBar::NUM_ELEMENTS_AFTER_CONTENT = 8;
+	const UINT32 GUIMenuBar::ELEMENT_SPACING = 10;
 
 	GUIMenuBar::GUIMenuBar(GUIWidget* parent, RenderWindow* parentWindow)
 		:mParentWidget(parent), mParentWindow(parentWindow), mMainPanel(nullptr), mMainLayout(nullptr),
@@ -69,6 +70,7 @@ namespace BansheeEngine
 		{
 			bs_delete(menu.menu);
 			GUIElement::destroy(menu.button);
+			GUIFixedSpace::destroy(menu.space);
 		}
 
 		GUILayout::destroy(mMainPanel);
@@ -143,9 +145,12 @@ namespace BansheeEngine
 		GUIButton* newButton = GUIButton::create(HString(name), "MenuBarBtn");
 		newButton->onClick.connect(std::bind(&GUIMenuBar::openSubMenu, this, name));
 		newButton->onHover.connect(std::bind(&GUIMenuBar::onSubMenuHover, this, name));
+
+		GUIFixedSpace* space = mMainLayout->insertNewElement<GUIFixedSpace>(mMainLayout->getNumChildren() - NUM_ELEMENTS_AFTER_CONTENT, ELEMENT_SPACING);
 		mMainLayout->insertElement(mMainLayout->getNumChildren() - NUM_ELEMENTS_AFTER_CONTENT, newButton);
 
 		newSubMenu.button = newButton;
+		newSubMenu.space = space;
 
 		return &newSubMenu;
 	}
@@ -192,7 +197,9 @@ namespace BansheeEngine
 				return;
 
 			mMainLayout->removeElement(subMenuToRemove->button);
+			mMainLayout->removeElement(subMenuToRemove->space);
 			GUIElement::destroy(subMenuToRemove->button);
+			GUIFixedSpace::destroy(subMenuToRemove->space);
 			bs_delete(subMenuToRemove->menu);
 
 			mChildMenus.erase(mChildMenus.begin() + curIdx);

MBansheeEditor/Inspector/InspectableArray.cs

@@ -38,10 +38,10 @@ namespace BansheeEditor
                     ownsTitleLayout = true;
                 }
 
-                GUIButton cloneBtn = new GUIButton("C");
-                GUIButton deleteBtn = new GUIButton("X");
-                GUIButton moveUpBtn = new GUIButton("Up");
-                GUIButton moveDownBtn = new GUIButton("Down");
+                GUIButton cloneBtn = new GUIButton("C", GUIOption.FixedWidth(20));
+                GUIButton deleteBtn = new GUIButton("X", GUIOption.FixedWidth(20));
+                GUIButton moveUpBtn = new GUIButton("U", GUIOption.FixedWidth(20));
+                GUIButton moveDownBtn = new GUIButton("D", GUIOption.FixedWidth(20));
 
                 cloneBtn.OnClick += () => parent.OnCloneButtonClicked(seqIndex);
                 deleteBtn.OnClick += () => parent.OnDeleteButtonClicked(seqIndex);
@@ -148,13 +148,14 @@ namespace BansheeEditor
                 guiChildLayout = null;
                 guiTitleLayout = layout.AddLayoutX(layoutIndex);
 
-                guiTitleLayout.AddElement(new GUILabel(title));
+                guiTitleLayout.AddElement(new GUILabel(title, GUIOption.FixedWidth(100)));
                 guiTitleLayout.AddElement(new GUILabel("Empty"));
 
                 if (!property.IsValueType)
                 {
-                    GUIButton createBtn = new GUIButton("Create");
+                    GUIButton createBtn = new GUIButton("Cr", GUIOption.FixedWidth(20));
                     createBtn.OnClick += OnCreateButtonClicked;
+                    guiTitleLayout.AddFlexibleSpace();
                     guiTitleLayout.AddElement(createBtn);
                 }
 
@@ -162,19 +163,20 @@ namespace BansheeEditor
             }
             else
             {
-                GUIFoldout guiFoldout = new GUIFoldout(title);
+                GUIFoldout guiFoldout = new GUIFoldout(title, GUIOption.FixedWidth(100));
                 guiFoldout.SetExpanded(isExpanded);
                 guiFoldout.OnToggled += OnFoldoutToggled;
                 guiSizeField = new GUIIntField();
                 guiSizeField.SetRange(0, int.MaxValue);
-                GUIButton guiResizeBtn = new GUIButton("Resize");
+                GUIButton guiResizeBtn = new GUIButton("R", GUIOption.FixedWidth(20));
                 guiResizeBtn.OnClick += OnResizeButtonClicked;
-                GUIButton guiClearBtn = new GUIButton("Clear");
+                GUIButton guiClearBtn = new GUIButton("Cl", GUIOption.FixedWidth(20));
                 guiClearBtn.OnClick += OnClearButtonClicked;
 
                 guiTitleLayout = layout.AddLayoutX(layoutIndex);
                 guiTitleLayout.AddElement(guiFoldout);
                 guiTitleLayout.AddElement(guiSizeField);
+                guiTitleLayout.AddFlexibleSpace();
                 guiTitleLayout.AddElement(guiResizeBtn);
                 guiTitleLayout.AddElement(guiClearBtn);
 

MBansheeEditor/Inspector/InspectableList.cs

@@ -38,10 +38,10 @@ namespace BansheeEditor
                     ownsTitleLayout = true;
                 }
 
-                GUIButton cloneBtn = new GUIButton("C");
-                GUIButton deleteBtn = new GUIButton("X");
-                GUIButton moveUpBtn = new GUIButton("Up");
-                GUIButton moveDownBtn = new GUIButton("Down");
+                GUIButton cloneBtn = new GUIButton("C", GUIOption.FixedWidth(20));
+                GUIButton deleteBtn = new GUIButton("X", GUIOption.FixedWidth(20));
+                GUIButton moveUpBtn = new GUIButton("U", GUIOption.FixedWidth(20));
+                GUIButton moveDownBtn = new GUIButton("D", GUIOption.FixedWidth(20));
 
                 cloneBtn.OnClick += () => parent.OnCloneButtonClicked(seqIndex);
                 deleteBtn.OnClick += () => parent.OnDeleteButtonClicked(seqIndex);
@@ -148,13 +148,14 @@ namespace BansheeEditor
                 guiChildLayout = null;
                 guiTitleLayout = layout.AddLayoutX(layoutIndex);
 
-                guiTitleLayout.AddElement(new GUILabel(title));
+                guiTitleLayout.AddElement(new GUILabel(title, GUIOption.FixedWidth(100)));
                 guiTitleLayout.AddElement(new GUILabel("Empty"));
 
                 if (!property.IsValueType)
                 {
-                    GUIButton createBtn = new GUIButton("Create");
+                    GUIButton createBtn = new GUIButton("Cr", GUIOption.FixedWidth(20));
                     createBtn.OnClick += OnCreateButtonClicked;
+                    guiTitleLayout.AddFlexibleSpace();
                     guiTitleLayout.AddElement(createBtn);
                 }
 
@@ -162,19 +163,20 @@ namespace BansheeEditor
             }
             else
             {
-                GUIFoldout guiFoldout = new GUIFoldout(title);
+                GUIFoldout guiFoldout = new GUIFoldout(title, GUIOption.FixedWidth(100));
                 guiFoldout.SetExpanded(isExpanded);
                 guiFoldout.OnToggled += OnFoldoutToggled;
                 guiSizeField = new GUIIntField();
                 guiSizeField.SetRange(0, int.MaxValue);
-                GUIButton guiResizeBtn = new GUIButton("Resize");
+                GUIButton guiResizeBtn = new GUIButton("R", GUIOption.FixedWidth(20));
                 guiResizeBtn.OnClick += OnResizeButtonClicked;
-                GUIButton guiClearBtn = new GUIButton("Clear");
+                GUIButton guiClearBtn = new GUIButton("Cl", GUIOption.FixedWidth(20));
                 guiClearBtn.OnClick += OnClearButtonClicked;
 
                 guiTitleLayout = layout.AddLayoutX(layoutIndex);
                 guiTitleLayout.AddElement(guiFoldout);
                 guiTitleLayout.AddElement(guiSizeField);
+                guiTitleLayout.AddFlexibleSpace();
                 guiTitleLayout.AddElement(guiResizeBtn);
                 guiTitleLayout.AddElement(guiClearBtn);
 
@@ -220,8 +222,6 @@ namespace BansheeEditor
             IList list = property.GetValue<IList>();
 
             int maxSize = MathEx.Min(size, list.Count);
-
-            Debug.Log("List resize: " + list.Count + " - " + newList.Count + " - " + size);
             for (int i = 0; i < maxSize; i++)
                 newList[i] = list[i];
 

MBansheeEditor/Inspector/InspectableObject.cs

@@ -61,13 +61,14 @@ namespace BansheeEditor
                 guiChildLayout = null;
                 guiTitleLayout = layout.AddLayoutX(index);
 
-                guiTitleLayout.AddElement(new GUILabel(title));
+                guiTitleLayout.AddElement(new GUILabel(title, GUIOption.FixedWidth(100)));
                 guiTitleLayout.AddElement(new GUILabel("Empty"));
 
                 if (!property.IsValueType)
                 {
-                    GUIButton createBtn = new GUIButton("Create");
+                    GUIButton createBtn = new GUIButton("Cr", GUIOption.FixedWidth(20));
                     createBtn.OnClick += OnCreateButtonClicked;
+                    guiTitleLayout.AddFlexibleSpace();
                     guiTitleLayout.AddElement(createBtn);
                 }
             }
@@ -75,13 +76,14 @@ namespace BansheeEditor
             {
                 guiTitleLayout = layout.AddLayoutX(index);
 
-                GUIFoldout guiFoldout = new GUIFoldout(title);
+                GUIFoldout guiFoldout = new GUIFoldout(title, GUIOption.FixedWidth(100));
                 guiFoldout.SetExpanded(isExpanded);
                 guiFoldout.OnToggled += OnFoldoutToggled;
                 guiTitleLayout.AddElement(guiFoldout);
 
-                GUIButton clearBtn = new GUIButton("Clear");
+                GUIButton clearBtn = new GUIButton("Cl", GUIOption.FixedWidth(20));
                 clearBtn.OnClick += OnClearButtonClicked;
+                guiTitleLayout.AddFlexibleSpace();
                 guiTitleLayout.AddElement(clearBtn);
 
                 if (isExpanded)

MBansheeEditor/Inspector/InspectorWindow.cs

@@ -157,8 +157,8 @@ namespace BansheeEditor
             GUILayoutY sceneObjectLayout = sceneObjectPanel.AddLayoutY();
 
             GUILayoutX nameLayout = sceneObjectLayout.AddLayoutX();
-            GUILabel nameLbl = new GUILabel(new LocEdString("Name"), GUIOption.FixedWidth(70));
-            soNameInput = new GUITextBox(false, GUIOption.FlexibleWidth(200));
+            GUILabel nameLbl = new GUILabel(new LocEdString("Name"), GUIOption.FixedWidth(50));
+            soNameInput = new GUITextBox(false, GUIOption.FlexibleWidth(180));
             soNameInput.Text = activeSO.Name;
             soNameInput.OnChanged += (x) => { if (activeSO != null) activeSO.Name = x; };
 
@@ -169,10 +169,10 @@ namespace BansheeEditor
             soPrefabLayout = sceneObjectLayout.AddLayoutX();
 
             GUILayoutX positionLayout = sceneObjectLayout.AddLayoutX();
-            GUILabel positionLbl = new GUILabel(new LocEdString("Position"), GUIOption.FixedWidth(70));
-            soPosX = new GUIFloatField(new LocEdString("X"), 10, "", GUIOption.FlexibleWidth(50));
-            soPosY = new GUIFloatField(new LocEdString("Y"), 10, "", GUIOption.FlexibleWidth(50));
-            soPosZ = new GUIFloatField(new LocEdString("Z"), 10, "", GUIOption.FlexibleWidth(50));
+            GUILabel positionLbl = new GUILabel(new LocEdString("Position"), GUIOption.FixedWidth(50));
+            soPosX = new GUIFloatField(new LocEdString("X"), 10, "", GUIOption.FixedWidth(60));
+            soPosY = new GUIFloatField(new LocEdString("Y"), 10, "", GUIOption.FixedWidth(60));
+            soPosZ = new GUIFloatField(new LocEdString("Z"), 10, "", GUIOption.FixedWidth(60));
 
             soPosX.OnChanged += (x) => OnPositionChanged(0, x);
             soPosY.OnChanged += (y) => OnPositionChanged(1, y);
@@ -181,16 +181,18 @@ namespace BansheeEditor
             positionLayout.AddElement(positionLbl);
             positionLayout.AddElement(soPosX);
             positionLayout.AddSpace(10);
+            positionLayout.AddFlexibleSpace();
             positionLayout.AddElement(soPosY);
             positionLayout.AddSpace(10);
+            positionLayout.AddFlexibleSpace();
             positionLayout.AddElement(soPosZ);
             positionLayout.AddFlexibleSpace();
 
             GUILayoutX rotationLayout = sceneObjectLayout.AddLayoutX();
-            GUILabel rotationLbl = new GUILabel(new LocEdString("Rotation"), GUIOption.FixedWidth(70));
-            soRotX = new GUIFloatField(new LocEdString("X"), 10, "", GUIOption.FlexibleWidth(50));
-            soRotY = new GUIFloatField(new LocEdString("Y"), 10, "", GUIOption.FlexibleWidth(50));
-            soRotZ = new GUIFloatField(new LocEdString("Z"), 10, "", GUIOption.FlexibleWidth(50));
+            GUILabel rotationLbl = new GUILabel(new LocEdString("Rotation"), GUIOption.FixedWidth(50));
+            soRotX = new GUIFloatField(new LocEdString("X"), 10, "", GUIOption.FixedWidth(60));
+            soRotY = new GUIFloatField(new LocEdString("Y"), 10, "", GUIOption.FixedWidth(60));
+            soRotZ = new GUIFloatField(new LocEdString("Z"), 10, "", GUIOption.FixedWidth(60));
 
             soRotX.OnChanged += (x) => OnRotationChanged(0, x);
             soRotY.OnChanged += (y) => OnRotationChanged(1, y);
@@ -199,16 +201,18 @@ namespace BansheeEditor
             rotationLayout.AddElement(rotationLbl);
             rotationLayout.AddElement(soRotX);
             rotationLayout.AddSpace(10);
+            rotationLayout.AddFlexibleSpace();
             rotationLayout.AddElement(soRotY);
             rotationLayout.AddSpace(10);
+            rotationLayout.AddFlexibleSpace();
             rotationLayout.AddElement(soRotZ);
             rotationLayout.AddFlexibleSpace();
 
             GUILayoutX scaleLayout = sceneObjectLayout.AddLayoutX();
-            GUILabel scaleLbl = new GUILabel(new LocEdString("Scale"), GUIOption.FixedWidth(70));
-            soScaleX = new GUIFloatField(new LocEdString("X"), 10, "", GUIOption.FlexibleWidth(50));
-            soScaleY = new GUIFloatField(new LocEdString("Y"), 10, "", GUIOption.FlexibleWidth(50));
-            soScaleZ = new GUIFloatField(new LocEdString("Z"), 10, "", GUIOption.FlexibleWidth(50));
+            GUILabel scaleLbl = new GUILabel(new LocEdString("Scale"), GUIOption.FixedWidth(50));
+            soScaleX = new GUIFloatField(new LocEdString("X"), 10, "", GUIOption.FixedWidth(60));
+            soScaleY = new GUIFloatField(new LocEdString("Y"), 10, "", GUIOption.FixedWidth(60));
+            soScaleZ = new GUIFloatField(new LocEdString("Z"), 10, "", GUIOption.FixedWidth(60));
 
             soScaleX.OnChanged += (x) => OnScaleChanged(0, x);
             soScaleY.OnChanged += (y) => OnScaleChanged(1, y);
@@ -217,8 +221,10 @@ namespace BansheeEditor
             scaleLayout.AddElement(scaleLbl);
             scaleLayout.AddElement(soScaleX);
             scaleLayout.AddSpace(10);
+            scaleLayout.AddFlexibleSpace();
             scaleLayout.AddElement(soScaleY);
             scaleLayout.AddSpace(10);
+            scaleLayout.AddFlexibleSpace();
             scaleLayout.AddElement(soScaleZ);
             scaleLayout.AddFlexibleSpace();
 
@@ -239,14 +245,14 @@ namespace BansheeEditor
                 for (int i = 0; i < numChildren; i++)
                     soPrefabLayout.GetChild(0).Destroy();
 
-                GUILabel prefabLabel =new GUILabel(new LocEdString("Prefab"), GUIOption.FixedWidth(70));
+                GUILabel prefabLabel =new GUILabel(new LocEdString("Prefab"), GUIOption.FixedWidth(50));
                 soPrefabLayout.AddElement(prefabLabel);
 
                 //if (hasPrefab) // TODO - Disabled check for preview purposes
                 {
-                    GUIButton btnApplyPrefab = new GUIButton(new LocEdString("Apply"));
-                    GUIButton btnRevertPrefab = new GUIButton(new LocEdString("Revert"));
-                    GUIButton btnBreakPrefab = new GUIButton(new LocEdString("Break"));
+                    GUIButton btnApplyPrefab = new GUIButton(new LocEdString("Apply"), GUIOption.FixedWidth(60));
+                    GUIButton btnRevertPrefab = new GUIButton(new LocEdString("Revert"), GUIOption.FixedWidth(60));
+                    GUIButton btnBreakPrefab = new GUIButton(new LocEdString("Break"), GUIOption.FixedWidth(60));
 
                     btnApplyPrefab.OnClick += () => PrefabUtility.ApplyPrefab(activeSO);
                     btnRevertPrefab.OnClick += () => PrefabUtility.RevertPrefab(activeSO);
@@ -417,7 +423,12 @@ namespace BansheeEditor
                 inspectorScrollArea = new GUIScrollArea();
                 GUI.AddElement(inspectorScrollArea);
                 inspectorLayout = inspectorScrollArea.Layout;
-                inspectorLayout.AddElement(new GUILabel(new LocEdString("No object selected")));
+
+                inspectorLayout.AddFlexibleSpace();
+                GUILayoutX layoutMsg = inspectorLayout.AddLayoutX();
+                layoutMsg.AddFlexibleSpace();
+                layoutMsg.AddElement(new GUILabel(new LocEdString("No object selected")));
+                layoutMsg.AddFlexibleSpace();
                 inspectorLayout.AddFlexibleSpace();
             }
             else if ((objects.Length + paths.Length) > 1)
@@ -426,7 +437,12 @@ namespace BansheeEditor
                 inspectorScrollArea = new GUIScrollArea();
                 GUI.AddElement(inspectorScrollArea);
                 inspectorLayout = inspectorScrollArea.Layout;
-                inspectorLayout.AddElement(new GUILabel(new LocEdString("Multiple objects selected")));
+
+                inspectorLayout.AddFlexibleSpace();
+                GUILayoutX layoutMsg = inspectorLayout.AddLayoutX();
+                layoutMsg.AddFlexibleSpace();
+                layoutMsg.AddElement(new GUILabel(new LocEdString("Multiple objects selected")));
+                layoutMsg.AddFlexibleSpace();
                 inspectorLayout.AddFlexibleSpace();
             }
             else if (objects.Length == 1)

SBansheeEditor/Source/BsScriptGUIFoldout.cpp

@@ -47,7 +47,7 @@ namespace BansheeEngine
 			options.addOption(mono_array_get(guiOptions, GUIOption, i));
 
 		HString label = ScriptGUIContent::getText(content);
-		GUIFoldout* guiFoldout = GUIFoldout::create(label);
+		GUIFoldout* guiFoldout = GUIFoldout::create(label, options);
 
 		guiFoldout->onStateChanged.connect(std::bind(&ScriptGUIFoldout::onToggled, instance, _1));
 

TODO.txt

@@ -62,9 +62,6 @@ Ribek use:
  - Load default layout on initial start
  - Test release mode
  - Ability to create assets in Project view (At least Material)
- - Need a way to add scene objects and components (and remove them)
-  - Need to add default components (Camera, Renderable, Light) to main menu
-  - Adding scene objects should be doable from context menu in Hierarchy, by dropping a Prefab or by main Menu (undoable)
  - (Optionally, needed for GUI editing) GUISkin resource inspector & a way to inspect and save the default editor skin
    - Will need C# wrapper for GUISkin (and a way to assign the current skin to a window)
 
@@ -74,7 +71,6 @@ First screenshot:
   - Assets (also add to context): Create(Folder, Material, Shader, Script, Prefab, GUI Skin), Show in explorer
   - Game Object (also add to context): Create(Empty, Empty Child, Camera, Renderable, Point/Spot/Directional Light), Apply prefab, Break prefab, Revert prefab
    - Possibly create helper objects: Cube, Sphere, Plane, Quad, Capsule, Cylinder
-  - Component (also add to inspector context): Camera, Renderable, Point/Spot/Directional light, all other components from scripts
   - Help - About, API Reference (link to site)
  - Modify inspector looks by scaling down transform input box sizes, and properly aligning component entries
  - (Optionally) New UI look (tabs, component/array containers, better buttons)
@@ -102,7 +98,7 @@ Other polish:
  - Drag to select in scene view
  - MenuBar - will likely need a way to mark elements as disabled when not appropriate (e.g. no "frame selected unless scene is focused")
    - Likely use a user-provided callback to trigger when populating the menus
- 
+ - Need to list all script components in the Components menu
 
 Stage 2 polish:
  - Inject an icon into an .exe (Win32 specific)