Browse Source

Applied UI style and material editor patch from Sebastian Delatorre.
Old style is still available as OldStyle.xml & OldUI.png.

Lasse Öörni 12 years ago
parent
commit
22651bf27c

+ 5 - 0
Bin/Data/Scripts/Editor.as

@@ -1,5 +1,6 @@
 // Urho3D editor
 // Urho3D editor
 
 
+#include "Scripts/Editor/EditorHierarchyWindow.as"
 #include "Scripts/Editor/EditorView.as"
 #include "Scripts/Editor/EditorView.as"
 #include "Scripts/Editor/EditorScene.as"
 #include "Scripts/Editor/EditorScene.as"
 #include "Scripts/Editor/EditorActions.as"
 #include "Scripts/Editor/EditorActions.as"
@@ -155,6 +156,8 @@ void LoadConfig()
     {
     {
         if (hierarchyElem.HasAttribute("showinternaluielement")) showInternalUIElement = hierarchyElem.GetBool("showinternaluielement");
         if (hierarchyElem.HasAttribute("showinternaluielement")) showInternalUIElement = hierarchyElem.GetBool("showinternaluielement");
         if (hierarchyElem.HasAttribute("showtemporaryobject")) showTemporaryObject = hierarchyElem.GetBool("showtemporaryobject");
         if (hierarchyElem.HasAttribute("showtemporaryobject")) showTemporaryObject = hierarchyElem.GetBool("showtemporaryobject");
+        if (inspectorElem.HasAttribute("nodecolor")) nodeTextColor = inspectorElem.GetColor("nodecolor");
+        if (inspectorElem.HasAttribute("componentcolor")) componentTextColor = inspectorElem.GetColor("componentcolor");
     }
     }
 
 
     if (!inspectorElem.isNull)
     if (!inspectorElem.isNull)
@@ -220,6 +223,8 @@ void SaveConfig()
 
 
     hierarchyElem.SetBool("showinternaluielement", showInternalUIElement);
     hierarchyElem.SetBool("showinternaluielement", showInternalUIElement);
     hierarchyElem.SetBool("showtemporaryobject", showTemporaryObject);
     hierarchyElem.SetBool("showtemporaryobject", showTemporaryObject);
+    inspectorElem.SetColor("nodecolor", nodeTextColor);
+    inspectorElem.SetColor("componentcolor", componentTextColor);
 
 
     inspectorElem.SetColor("originalcolor", normalTextColor);
     inspectorElem.SetColor("originalcolor", normalTextColor);
     inspectorElem.SetColor("modifiedcolor", modifiedTextColor);
     inspectorElem.SetColor("modifiedcolor", modifiedTextColor);

+ 5 - 0
Bin/Data/Scripts/Editor/EditorHierarchyWindow.as

@@ -13,6 +13,8 @@ const ShortStringHash NODE_ID_VAR("NodeID");
 const ShortStringHash COMPONENT_ID_VAR("ComponentID");
 const ShortStringHash COMPONENT_ID_VAR("ComponentID");
 const ShortStringHash UI_ELEMENT_ID_VAR("UIElementID");
 const ShortStringHash UI_ELEMENT_ID_VAR("UIElementID");
 const ShortStringHash[] ID_VARS = { ShortStringHash(""), NODE_ID_VAR, COMPONENT_ID_VAR, UI_ELEMENT_ID_VAR };
 const ShortStringHash[] ID_VARS = { ShortStringHash(""), NODE_ID_VAR, COMPONENT_ID_VAR, UI_ELEMENT_ID_VAR };
+Color nodeTextColor(1.0f, 1.0f, 1.0f);
+Color componentTextColor(0.7f, 1.0f, 0.7f);
 
 
 Window@ hierarchyWindow;
 Window@ hierarchyWindow;
 ListView@ hierarchyList;
 ListView@ hierarchyList;
@@ -200,6 +202,7 @@ uint UpdateHierarchyItem(uint itemIndex, Serializable@ serializable, UIElement@
             Node@ node = cast<Node>(serializable);
             Node@ node = cast<Node>(serializable);
 
 
             text.text = GetNodeTitle(node);
             text.text = GetNodeTitle(node);
+            text.color = nodeTextColor;
             SetIconEnabledColor(text, node.enabled);
             SetIconEnabledColor(text, node.enabled);
 
 
             // Update components first
             // Update components first
@@ -225,6 +228,7 @@ uint UpdateHierarchyItem(uint itemIndex, Serializable@ serializable, UIElement@
         {
         {
             Component@ component = cast<Component>(serializable);
             Component@ component = cast<Component>(serializable);
             text.text = GetComponentTitle(component);
             text.text = GetComponentTitle(component);
+            text.color = componentTextColor;
             SetIconEnabledColor(text, component.enabledEffective);
             SetIconEnabledColor(text, component.enabledEffective);
             break;
             break;
         }
         }
@@ -279,6 +283,7 @@ void AddComponentItem(uint compItemIndex, Component@ component, UIElement@ paren
     text.vars[NODE_ID_VAR] = component.node.id;
     text.vars[NODE_ID_VAR] = component.node.id;
     text.vars[COMPONENT_ID_VAR] = component.id;
     text.vars[COMPONENT_ID_VAR] = component.id;
     text.text = GetComponentTitle(component);
     text.text = GetComponentTitle(component);
+    text.color = componentTextColor;
 
 
     IconizeUIElement(text, component.typeName);
     IconizeUIElement(text, component.typeName);
     SetIconEnabledColor(text, component.enabledEffective);
     SetIconEnabledColor(text, component.enabledEffective);

+ 5 - 4
Bin/Data/Scripts/Editor/EditorMaterial.as

@@ -92,6 +92,7 @@ void InitMaterialPreview()
     previewModel.model = cache.GetResource("Model", "Models/Sphere.mdl");
     previewModel.model = cache.GetResource("Model", "Models/Sphere.mdl");
 
 
     materialPreview = materialWindow.GetChild("MaterialPreview", true);
     materialPreview = materialWindow.GetChild("MaterialPreview", true);
+    materialPreview.SetFixedHeight(100);
     materialPreview.SetView(previewScene, camera);
     materialPreview.SetView(previewScene, camera);
     materialPreview.autoUpdate = false;
     materialPreview.autoUpdate = false;
 
 
@@ -129,7 +130,7 @@ void RefreshMaterialPreview()
 
 
 void RefreshMaterialName()
 void RefreshMaterialName()
 {
 {
-    UIElement@ container = materialWindow.GetChild("NameContainer");
+    UIElement@ container = materialWindow.GetChild("NameContainer", true);
     container.RemoveAllChildren();
     container.RemoveAllChildren();
 
 
     LineEdit@ nameEdit = CreateAttributeLineEdit(container, null, 0, 0);
     LineEdit@ nameEdit = CreateAttributeLineEdit(container, null, 0, 0);
@@ -143,7 +144,7 @@ void RefreshMaterialName()
 
 
 void RefreshMaterialTechniques(bool fullUpdate = true)
 void RefreshMaterialTechniques(bool fullUpdate = true)
 {
 {
-    ListView@ list = materialWindow.GetChild("TechniqueList");
+    ListView@ list = materialWindow.GetChild("TechniqueList", true);
 
 
     if (editMaterial is null)
     if (editMaterial is null)
         return;
         return;
@@ -215,7 +216,7 @@ void RefreshMaterialTextures(bool fullUpdate = true)
 {
 {
     if (fullUpdate)
     if (fullUpdate)
     {
     {
-        ListView@ list = materialWindow.GetChild("TextureList");
+        ListView@ list = materialWindow.GetChild("TextureList", true);
         list.RemoveAllItems();
         list.RemoveAllItems();
     
     
         for (uint i = 0; i < MAX_MATERIAL_TEXTURE_UNITS; ++i)
         for (uint i = 0; i < MAX_MATERIAL_TEXTURE_UNITS; ++i)
@@ -268,7 +269,7 @@ void RefreshMaterialTextures(bool fullUpdate = true)
 
 
 void RefreshMaterialShaderParameters()
 void RefreshMaterialShaderParameters()
 {
 {
-    ListView@ list = materialWindow.GetChild("ShaderParameterList");
+    ListView@ list = materialWindow.GetChild("ShaderParameterList", true);
     list.RemoveAllItems();
     list.RemoveAllItems();
     if (editMaterial is null)
     if (editMaterial is null)
         return;
         return;

+ 54 - 0
Bin/Data/Scripts/Editor/EditorPreferences.as

@@ -3,6 +3,13 @@
 bool subscribedToEditorPreferences = false;
 bool subscribedToEditorPreferences = false;
 Window@ preferencesDialog;
 Window@ preferencesDialog;
 
 
+LineEdit@ nodeItemTextColorEditR;
+LineEdit@ nodeItemTextColorEditG;
+LineEdit@ nodeItemTextColorEditB;
+LineEdit@ componentItemTextColorEditR;
+LineEdit@ componentItemTextColorEditG;
+LineEdit@ componentItemTextColorEditB;
+
 LineEdit@ originalAttributeTextColorEditR;
 LineEdit@ originalAttributeTextColorEditR;
 LineEdit@ originalAttributeTextColorEditG;
 LineEdit@ originalAttributeTextColorEditG;
 LineEdit@ originalAttributeTextColorEditB;
 LineEdit@ originalAttributeTextColorEditB;
@@ -23,6 +30,13 @@ void CreateEditorPreferencesDialog()
     preferencesDialog.opacity = uiMaxOpacity;
     preferencesDialog.opacity = uiMaxOpacity;
     CenterDialog(preferencesDialog);
     CenterDialog(preferencesDialog);
 
 
+    nodeItemTextColorEditR = preferencesDialog.GetChild("NodeItemTextColor.r", true);
+    nodeItemTextColorEditG = preferencesDialog.GetChild("NodeItemTextColor.g", true);
+    nodeItemTextColorEditB = preferencesDialog.GetChild("NodeItemTextColor.b", true);
+    componentItemTextColorEditR = preferencesDialog.GetChild("ComponentItemTextColor.r", true);
+    componentItemTextColorEditG = preferencesDialog.GetChild("ComponentItemTextColor.g", true);
+    componentItemTextColorEditB = preferencesDialog.GetChild("ComponentItemTextColor.b", true);
+
     originalAttributeTextColorEditR = preferencesDialog.GetChild("OriginalAttributeTextColor.r", true);
     originalAttributeTextColorEditR = preferencesDialog.GetChild("OriginalAttributeTextColor.r", true);
     originalAttributeTextColorEditG = preferencesDialog.GetChild("OriginalAttributeTextColor.g", true);
     originalAttributeTextColorEditG = preferencesDialog.GetChild("OriginalAttributeTextColor.g", true);
     originalAttributeTextColorEditB = preferencesDialog.GetChild("OriginalAttributeTextColor.b", true);
     originalAttributeTextColorEditB = preferencesDialog.GetChild("OriginalAttributeTextColor.b", true);
@@ -54,6 +68,14 @@ void UpdateEditorPreferencesDialog()
     CheckBox@ showTemporaryObjectToggle = preferencesDialog.GetChild("ShowTemporaryObject", true);
     CheckBox@ showTemporaryObjectToggle = preferencesDialog.GetChild("ShowTemporaryObject", true);
     showTemporaryObjectToggle.checked = showTemporaryObject;
     showTemporaryObjectToggle.checked = showTemporaryObject;
 
 
+    nodeItemTextColorEditR.text = String(nodeTextColor.r);
+    nodeItemTextColorEditG.text = String(nodeTextColor.g);
+    nodeItemTextColorEditB.text = String(nodeTextColor.b);
+
+    componentItemTextColorEditR.text = String(componentTextColor.r);
+    componentItemTextColorEditG.text = String(componentTextColor.g);
+    componentItemTextColorEditB.text = String(componentTextColor.b);
+
     CheckBox@ showNonEditableAttributeToggle = preferencesDialog.GetChild("ShowNonEditableAttribute", true);
     CheckBox@ showNonEditableAttributeToggle = preferencesDialog.GetChild("ShowNonEditableAttribute", true);
     showNonEditableAttributeToggle.checked = showNonEditableAttribute;
     showNonEditableAttributeToggle.checked = showNonEditableAttribute;
 
 
@@ -75,6 +97,12 @@ void UpdateEditorPreferencesDialog()
         SubscribeToEvent(uiMaxOpacityEdit, "TextFinished", "EditUIMaxOpacity");
         SubscribeToEvent(uiMaxOpacityEdit, "TextFinished", "EditUIMaxOpacity");
         SubscribeToEvent(showInternalUIElementToggle, "Toggled", "ToggleShowInternalUIElement");
         SubscribeToEvent(showInternalUIElementToggle, "Toggled", "ToggleShowInternalUIElement");
         SubscribeToEvent(showTemporaryObjectToggle, "Toggled", "ToggleShowTemporaryObject");
         SubscribeToEvent(showTemporaryObjectToggle, "Toggled", "ToggleShowTemporaryObject");
+        SubscribeToEvent(nodeItemTextColorEditR, "TextFinished", "EditNodeTextColor");
+        SubscribeToEvent(nodeItemTextColorEditG, "TextFinished", "EditNodeTextColor");
+        SubscribeToEvent(nodeItemTextColorEditB, "TextFinished", "EditNodeTextColor");
+        SubscribeToEvent(componentItemTextColorEditR, "TextFinished", "EditComponentTextColor");
+        SubscribeToEvent(componentItemTextColorEditG, "TextFinished", "EditComponentTextColor");
+        SubscribeToEvent(componentItemTextColorEditB, "TextFinished", "EditComponentTextColor");
         SubscribeToEvent(showNonEditableAttributeToggle, "Toggled", "ToggleShowNonEditableAttribute");
         SubscribeToEvent(showNonEditableAttributeToggle, "Toggled", "ToggleShowNonEditableAttribute");
         SubscribeToEvent(originalAttributeTextColorEditR, "TextFinished", "EditOriginalAttributeTextColor");
         SubscribeToEvent(originalAttributeTextColorEditR, "TextFinished", "EditOriginalAttributeTextColor");
         SubscribeToEvent(originalAttributeTextColorEditG, "TextFinished", "EditOriginalAttributeTextColor");
         SubscribeToEvent(originalAttributeTextColorEditG, "TextFinished", "EditOriginalAttributeTextColor");
@@ -134,6 +162,32 @@ void ToggleShowTemporaryObject(StringHash eventType, VariantMap& eventData)
     UpdateHierarchyItem(editorUIElement, true);
     UpdateHierarchyItem(editorUIElement, true);
 }
 }
 
 
+void EditNodeTextColor(StringHash eventType, VariantMap& eventData)
+{
+    LineEdit@ edit = eventData["Element"].GetUIElement();
+    nodeTextColor = Color(nodeItemTextColorEditR.text.ToFloat(), nodeItemTextColorEditG.text.ToFloat(), nodeItemTextColorEditB.text.ToFloat());
+    if (edit.name == "NodeItemTextColor.r")
+        edit.text = String(normalTextColor.r);
+    else if (edit.name == "NodeItemTextColor.g")
+        edit.text = String(normalTextColor.g);
+    else if (edit.name == "NodeItemTextColor.b")
+        edit.text = String(normalTextColor.b);
+    UpdateHierarchyItem(editorScene);
+}
+
+void EditComponentTextColor(StringHash eventType, VariantMap& eventData)
+{
+    LineEdit@ edit = eventData["Element"].GetUIElement();
+    componentTextColor = Color(componentItemTextColorEditR.text.ToFloat(), componentItemTextColorEditG.text.ToFloat(), componentItemTextColorEditB.text.ToFloat());
+    if (edit.name == "ComponentItemTextColor.r")
+        edit.text = String(normalTextColor.r);
+    else if (edit.name == "ComponentItemTextColor.g")
+        edit.text = String(normalTextColor.g);
+    else if (edit.name == "ComponentItemTextColor.b")
+        edit.text = String(normalTextColor.b);
+    UpdateHierarchyItem(editorScene);
+}
+
 void ToggleShowNonEditableAttribute(StringHash eventType, VariantMap& eventData)
 void ToggleShowNonEditableAttribute(StringHash eventType, VariantMap& eventData)
 {
 {
     showNonEditableAttribute = cast<CheckBox>(eventData["Element"].GetUIElement()).checked;
     showNonEditableAttribute = cast<CheckBox>(eventData["Element"].GetUIElement()).checked;

BIN
Bin/Data/Textures/OldUI.png


+ 5 - 0
Bin/Data/Textures/OldUI.xml

@@ -0,0 +1,5 @@
+<texture>
+    <mipmap enable="false" />
+    <quality low="0" />
+</texture>
+

BIN
Bin/Data/Textures/UI.png


+ 51 - 41
Bin/Data/UI/DefaultStyle.xml

@@ -13,7 +13,7 @@
     <element type="CheckBox" style="BorderImage">
     <element type="CheckBox" style="BorderImage">
         <attribute name="Min Size" value="16 16" />
         <attribute name="Min Size" value="16 16" />
         <attribute name="Max Size" value="16 16" />
         <attribute name="Max Size" value="16 16" />
-        <attribute name="Image Rect" value="64 0 80 16" />
+        <attribute name="Image Rect" value="80 0 96 16" />
         <attribute name="Border" value="4 4 4 4" />
         <attribute name="Border" value="4 4 4 4" />
         <attribute name="Checked Image Offset" value="16 0" />
         <attribute name="Checked Image Offset" value="16 0" />
         <attribute name="Hover Image Offset" value="0 16" />
         <attribute name="Hover Image Offset" value="0 16" />
@@ -21,7 +21,7 @@
     <element type="CloseButton" style="Button" auto="false">    <!-- non-auto style is shown explicitly in the Editor's style drop down list for user selection -->
     <element type="CloseButton" style="Button" auto="false">    <!-- non-auto style is shown explicitly in the Editor's style drop down list for user selection -->
         <attribute name="Min Size" value="16 16" />
         <attribute name="Min Size" value="16 16" />
         <attribute name="Max Size" value="16 16" />
         <attribute name="Max Size" value="16 16" />
-        <attribute name="Image Rect" value="128 0 144 16" />
+        <attribute name="Image Rect" value="144 0 160 16" />
     </element>
     </element>
     <element type="Cursor">
     <element type="Cursor">
         <attribute name="Shapes">
         <attribute name="Shapes">
@@ -72,23 +72,24 @@
             <element type="Text" internal="true" />
             <element type="Text" internal="true" />
         </element>
         </element>
         <element type="Window" internal="true" popup="true">
         <element type="Window" internal="true" popup="true">
-            <attribute name="Layout Border" value="2 2 2 2" />
+            <attribute name="Layout Border" value="4 4 4 4" />
             <element type="ListView" internal="true">
             <element type="ListView" internal="true">
                 <attribute name="Highlight Mode" value="Always" />
                 <attribute name="Highlight Mode" value="Always" />
                 <element type="BorderImage" internal="true">    <!-- Override scroll panel attributes from default ListView -->
                 <element type="BorderImage" internal="true">    <!-- Override scroll panel attributes from default ListView -->
-                    <attribute name="Image Rect" value="96 0 112 16" />
-                    <attribute name="Border" value="2 2 2 2" />
+                    <attribute name="Image Rect" value="112 0 128 16" />
+                    <attribute name="Border" value="4 4 4 4" />
                 </element>
                 </element>
             </element>
             </element>
         </element>
         </element>
     </element>
     </element>
     <element type="LineEdit" style="BorderImage">
     <element type="LineEdit" style="BorderImage">
-        <attribute name="Image Rect" value="112 0 128 16" />
-        <attribute name="Border" value="2 2 2 2" />
+        <attribute name="Border" value="4 4 4 4" />
         <attribute name="Clip Border" value="1 1 1 1" />
         <attribute name="Clip Border" value="1 1 1 1" />
+        <attribute name="Image Rect" value="64 0 80 16" />
         <attribute name="Hover Image Offset" value="0 16" />    <!-- Background color of the hover image IS the hover color of LineEdit -->
         <attribute name="Hover Image Offset" value="0 16" />    <!-- Background color of the hover image IS the hover color of LineEdit -->
         <element type="Text" internal="true">
         <element type="Text" internal="true">
-            <attribute name="Selection Color" value="0.7 0.7 0.7 1" />
+            <attribute name="Color" value="0.9 1 0.9 1" />
+            <attribute name="Selection Color" value="0.2 0.2 0.2 1" />
         </element>
         </element>
         <element type="BorderImage" internal="true">
         <element type="BorderImage" internal="true">
             <attribute name="Size" value="4 16" />
             <attribute name="Size" value="4 16" />
@@ -100,40 +101,41 @@
     <element type="ListViewHierarchyOverlay" style="BorderImage">
     <element type="ListViewHierarchyOverlay" style="BorderImage">
         <attribute name="Min Size" value="16 16" />
         <attribute name="Min Size" value="16 16" />
         <attribute name="Max Size" value="16 16" />
         <attribute name="Max Size" value="16 16" />
-        <attribute name="Image Rect" value="160 0 176 16" />
+        <attribute name="Image Rect" value="176 0 192 16" />
         <attribute name="Checked Image Offset" value="16 0" />
         <attribute name="Checked Image Offset" value="16 0" />
         <attribute name="Hover Image Offset" value="0 16" />
         <attribute name="Hover Image Offset" value="0 16" />
     </element>
     </element>
     <element type="Menu" style="BorderImage">
     <element type="Menu" style="BorderImage">
-        <attribute name="Image Rect" value="96 0 112 16" />
-        <attribute name="Border" value="2 2 2 2" />
+        <attribute name="Image Rect" value="112 0 128 16" />
+        <attribute name="Border" value="4 4 4 4" />
         <attribute name="Pressed Image Offset" value="16 0" />
         <attribute name="Pressed Image Offset" value="16 0" />
         <attribute name="Hover Image Offset" value="0 16" />
         <attribute name="Hover Image Offset" value="0 16" />
     </element>
     </element>
     <element type="ScrollBar">
     <element type="ScrollBar">
+        <attribute name="Min Size" value="16 16" />
         <attribute name="Left Image Rect" value="32 32 48 48" />
         <attribute name="Left Image Rect" value="32 32 48 48" />
         <attribute name="Up Image Rect" value="0 32 16 48" />
         <attribute name="Up Image Rect" value="0 32 16 48" />
         <attribute name="Right Image Rect" value="48 32 64 48" />
         <attribute name="Right Image Rect" value="48 32 64 48" />
         <attribute name="Down Image Rect" value="16 32 32 48" />
         <attribute name="Down Image Rect" value="16 32 32 48" />
         <element type="Button" internal="true">
         <element type="Button" internal="true">
             <attribute name="Size" value="12 12" />
             <attribute name="Size" value="12 12" />
-            <attribute name="Border" value="3 3 3 3" />
+            <attribute name="Border" value="4 4 4 4" />
             <attribute name="Pressed Image Offset" value="64 0" />
             <attribute name="Pressed Image Offset" value="64 0" />
             <attribute name="Hover Image Offset" value="0 16" />
             <attribute name="Hover Image Offset" value="0 16" />
         </element>
         </element>
         <element type="Slider" internal="true">
         <element type="Slider" internal="true">
             <attribute name="Size" value="12 12" />
             <attribute name="Size" value="12 12" />
-            <attribute name="Image Rect" value="112 0 128 16" />
-            <attribute name="Border" value="3 3 3 3" />
+            <attribute name="Image Rect" value="48 0 64 16" />
+            <attribute name="Border" value="4 4 4 4" />
             <element type="BorderImage" internal="true">
             <element type="BorderImage" internal="true">
-                <attribute name="Image Rect" value="48 0 64 16" />
+                <attribute name="Image Rect" value="16 0 32 16" />
                 <attribute name="Border" value="4 4 4 4" />
                 <attribute name="Border" value="4 4 4 4" />
                 <attribute name="Hover Image Offset" value="0 16" />
                 <attribute name="Hover Image Offset" value="0 16" />
             </element>
             </element>
         </element>
         </element>
         <element type="Button" internal="true">
         <element type="Button" internal="true">
             <attribute name="Size" value="12 12" />
             <attribute name="Size" value="12 12" />
-            <attribute name="Border" value="3 3 3 3" />
+            <attribute name="Border" value="4 4 4 4" />
             <attribute name="Pressed Image Offset" value="64 0" />
             <attribute name="Pressed Image Offset" value="64 0" />
             <attribute name="Hover Image Offset" value="0 16" />
             <attribute name="Hover Image Offset" value="0 16" />
         </element>
         </element>
@@ -146,15 +148,15 @@
             <attribute name="Size" value="12 0" />
             <attribute name="Size" value="12 0" />
         </element>
         </element>
         <element type="BorderImage" internal="true">
         <element type="BorderImage" internal="true">
-            <attribute name="Image Rect" value="112 0 128 16" />
-            <attribute name="Border" value="2 2 2 2" />
+            <attribute name="Image Rect" value="128 0 144 16" />
+            <attribute name="Border" value="4 4 4 4" />
             <attribute name="Clip Border" value="1 1 1 1" />
             <attribute name="Clip Border" value="1 1 1 1" />
         </element>
         </element>
     </element>
     </element>
     <element type="Slider" style="BorderImage">
     <element type="Slider" style="BorderImage">
         <attribute name="Size" value="12 12" />
         <attribute name="Size" value="12 12" />
         <attribute name="Image Rect" value="112 0 128 16" />
         <attribute name="Image Rect" value="112 0 128 16" />
-        <attribute name="Border" value="3 3 3 3" />
+        <attribute name="Border" value="4 4 4 4" />
         <element type="BorderImage" internal="true">
         <element type="BorderImage" internal="true">
             <attribute name="Image Rect" value="48 0 64 16" />
             <attribute name="Image Rect" value="48 0 64 16" />
             <attribute name="Border" value="4 4 4 4" />
             <attribute name="Border" value="4 4 4 4" />
@@ -163,32 +165,40 @@
     </element>
     </element>
     <element type="Window" style="BorderImage">
     <element type="Window" style="BorderImage">
         <attribute name="Image Rect" value="48 0 64 16" />
         <attribute name="Image Rect" value="48 0 64 16" />
-        <attribute name="Border" value="3 3 3 3" />
+        <attribute name="Border" value="4 4 4 4" />
         <attribute name="Resize Border" value="8 8 8 8" />
         <attribute name="Resize Border" value="8 8 8 8" />
     </element>
     </element>
+    <element type="PanelView" style="ListView">
+        <element type="BorderImage" internal="true" style="none">
+            <attribute name="Image Rect" value="48 16 64 32" />
+            <attribute name="Border" value="4 4 4 4" />
+            <element internal="true" style="none">
+                <attribute name="Layout Spacing" value="4" />
+                <attribute name="Layout Border" value="4 4 4 4" />
+            </element>
+        </element>
+    </element>
+    <element type="Panel" style="UIElement">
+        <attribute name="Layout Mode" value="Vertical" />
+        <attribute name="Layout Spacing" value="4" />
+    </element>
     <element type="Text">
     <element type="Text">
         <attribute name="Font" value="Font;Fonts/Anonymous Pro.ttf" />
         <attribute name="Font" value="Font;Fonts/Anonymous Pro.ttf" />
         <attribute name="Font Size" value="11" />
         <attribute name="Font Size" value="11" />
+        <attribute name="Color" value="0.85 0.85 0.85" />
     </element>
     </element>
     <element type="DebugHudText" style="Text" auto="false" />
     <element type="DebugHudText" style="Text" auto="false" />
     <element type="ConsoleBackground" auto="false">
     <element type="ConsoleBackground" auto="false">
-        <attribute name="Top Left Color" value="0 0.25 0 0.75" />
-        <attribute name="Top Right Color" value="0 0.25 0 0.75" />
-        <attribute name="Bottom Left Color" value="0.25 0.75 0.25 0.75" />
-        <attribute name="Bottom Right Color" value="0.25 0.75 0.25 0.75" />
+        <attribute name="Color" value="0.15 0.15 0.15 0.8" />
         <attribute name="Layout Border" value="4 4 4 4" />
         <attribute name="Layout Border" value="4 4 4 4" />
     </element>
     </element>
     <element type="ConsoleText" style="Text" auto="false" />
     <element type="ConsoleText" style="Text" auto="false" />
     <element type="ConsoleHighlightedText" style="Text" auto="false">
     <element type="ConsoleHighlightedText" style="Text" auto="false">
-        <attribute name="Color" value="0.75 0 0 1" />
+        <attribute name="Color" value="1 0 0 1" />
     </element>
     </element>
     <element type="ConsoleLineEdit" style="LineEdit" auto="false">
     <element type="ConsoleLineEdit" style="LineEdit" auto="false">
-        <attribute name="Top Left Color" value="0 0 0 0.5" />
-        <attribute name="Top Right Color" value="0 0 0 0.5" />
-        <attribute name="Bottom Left Color" value="0 0 0 0.5" />
-        <attribute name="Bottom Right Color" value="0 0 0 0.5" />
         <element type="Text" internal="true" style="none">
         <element type="Text" internal="true" style="none">
-            <attribute name="Selection Color" value="0 0.5 0 0.75" />
+            <attribute name="Selection Color" value="0.3 0.4 0.7 0.75" />
         </element>
         </element>
     </element>
     </element>
     <element type="FileSelector" style="Window" auto="false">
     <element type="FileSelector" style="Window" auto="false">
@@ -199,8 +209,8 @@
         <attribute name="Layout Mode" value="vertical" />
         <attribute name="Layout Mode" value="vertical" />
         <attribute name="Layout Spacing" value="4" />
         <attribute name="Layout Spacing" value="4" />
         <attribute name="Layout Border" value="6 6 6 6" />
         <attribute name="Layout Border" value="6 6 6 6" />
-        <attribute name="Modal Shade Color" value="0.45 0.70 0.45 0.05" />
-        <attribute name="Modal Frame Color" value="0.45 0.70 0.45" />
+        <attribute name="Modal Shade Color" value="0.3 0.4 0.7 0.05" />
+        <attribute name="Modal Frame Color" value="0.3 0.4 0.7" />
         <attribute name="Modal Frame Size" value="2 2" />
         <attribute name="Modal Frame Size" value="2 2" />
     </element>
     </element>
     <element type="FileSelectorButton" style="Button" auto="false">
     <element type="FileSelectorButton" style="Button" auto="false">
@@ -217,8 +227,8 @@
     </element>
     </element>
     <element type="FileSelectorFilterText" style="Text" auto="false">
     <element type="FileSelectorFilterText" style="Text" auto="false">
         <attribute name="Is Enabled" value="true" />
         <attribute name="Is Enabled" value="true" />
-        <attribute name="Selection Color" value="0.7 0.7 0.7 1" />
-        <attribute name="Hover Color" value="0.45 0.7 0.45 1" />
+        <attribute name="Selection Color" value="0.2 0.2 0.2 1" />
+        <attribute name="Hover Color" value="0.3 0.4 0.7 1" />
     </element>
     </element>
     <element type="FileSelectorTitleLayout" auto="false">
     <element type="FileSelectorTitleLayout" auto="false">
         <attribute name="Min Size" value="0 16" />
         <attribute name="Min Size" value="0 16" />
@@ -229,19 +239,19 @@
         <attribute name="Layout Spacing" value="4" />
         <attribute name="Layout Spacing" value="4" />
     </element>
     </element>
     <element type="FileSelectorListText" style="Text" auto="false">
     <element type="FileSelectorListText" style="Text" auto="false">
-        <attribute name="Hover Color" value="0.45 0.7 0.45 1" />
-        <attribute name="Selection Color" value="0.7 0.7 0.7 1" />
+        <attribute name="Hover Color" value="0.3 0.4 0.7 1" />
+        <attribute name="Selection Color" value="0.2 0.2 0.2 1" />
     </element>
     </element>
     <element type="FileSelectorTitleText" style="Text" auto="false" />
     <element type="FileSelectorTitleText" style="Text" auto="false" />
     <element type="EditorDivider" style="BorderImage" auto="false">
     <element type="EditorDivider" style="BorderImage" auto="false">
         <attribute name="Image Rect" value="144 32 160 43" />
         <attribute name="Image Rect" value="144 32 160 43" />
-        <attribute name="Border" value="2 2 2 2" />
+        <attribute name="Border" value="4 4 4 4" />
         <attribute name="Min Size" value="0 11" />
         <attribute name="Min Size" value="0 11" />
         <attribute name="Max Size" value="2147483647 11" />
         <attribute name="Max Size" value="2147483647 11" />
     </element>
     </element>
     <element type="EditorMenuBar" style="BorderImage" auto="false">
     <element type="EditorMenuBar" style="BorderImage" auto="false">
-        <attribute name="Image Rect" value="96 0 112 16" />
-        <attribute name="Border" value="2 2 2 2" />
+        <attribute name="Image Rect" value="112 0 128 16" />
+        <attribute name="Border" value="4 4 4 4" />
     </element>
     </element>
     <element type="EditorMenuText" style="Text" auto="false" />
     <element type="EditorMenuText" style="Text" auto="false" />
     <element type="EditorAttributeText" auto="false">
     <element type="EditorAttributeText" auto="false">
@@ -250,8 +260,8 @@
     </element>
     </element>
     <element type="EditorEnumAttributeText" style="EditorAttributeText" auto="false">
     <element type="EditorEnumAttributeText" style="EditorAttributeText" auto="false">
         <attribute name="Is Enabled" value="true" />
         <attribute name="Is Enabled" value="true" />
-        <attribute name="Selection Color" value="0.7 0.7 0.7 1" />
-        <attribute name="Hover Color" value="0.45 0.7 0.45 1" />
+        <attribute name="Selection Color" value="0.2 0.2 0.2 1" />
+        <attribute name="Hover Color" value="0.3 0.4 0.7 1" />
     </element>
     </element>
     <element type="EditorAttributeEdit" style="LineEdit" auto="false" />
     <element type="EditorAttributeEdit" style="LineEdit" auto="false" />
 </elements>
 </elements>

+ 178 - 161
Bin/Data/UI/EditorMaterialWindow.xml

@@ -22,7 +22,6 @@
         <attribute name="Name" value="MaterialPreview" />
         <attribute name="Name" value="MaterialPreview" />
         <attribute name="Texture" value="Texture2D;" />
         <attribute name="Texture" value="Texture2D;" />
         <attribute name="Use Derived Opacity" value="false" />
         <attribute name="Use Derived Opacity" value="false" />
-        <attribute name="Min Size" value="8 100" />
         <attribute name="Is Resizable" value="true" />
         <attribute name="Is Resizable" value="true" />
         <attribute name="Fixed Height Resizing" value="true" />
         <attribute name="Fixed Height Resizing" value="true" />
         <attribute name="Resize Border" value="0 6 0 6" />
         <attribute name="Resize Border" value="0 6 0 6" />
@@ -35,180 +34,198 @@
         <attribute name="Name" value="NameContainer" />
         <attribute name="Name" value="NameContainer" />
     </element>
     </element>
     <element type="BorderImage" style="EditorDivider" />
     <element type="BorderImage" style="EditorDivider" />
-    <element type="Text">
-        <attribute name="Text" value="Techniques" />
-    </element>
-    <element type="ListView">
-        <attribute name="Name" value="TechniqueList" />
-    </element>
-    <element>
-        <attribute name="Name" value="TechniqueButtonContainer" />
-        <attribute name="Min Size" value="0 16" />
-        <attribute name="Max Size" value="2147483647 16" />
-        <attribute name="Layout Mode" value="Horizontal" />
-        <element type="Button">
-            <attribute name="Name" value="NewTechniqueButton" />
-            <attribute name="Layout Mode" value="Horizontal" />
-            <attribute name="Layout Border" value="1 1 1 1" />
-            <element type="Text">
-                <attribute name="Text" value="New" />
-                <attribute name="Text Alignment" value="Center" />
-            </element>
-        </element>
-        <element type="Button">
-            <attribute name="Name" value="DeleteTechniqueButton" />
-            <attribute name="Layout Mode" value="Horizontal" />
-            <attribute name="Layout Border" value="1 1 1 1" />
-            <element type="Text">
-                <attribute name="Text" value="Del" />
-                <attribute name="Text Alignment" value="Center" />
-            </element>
-        </element>
-        <element type="Button">
-            <attribute name="Name" value="SortTechniquesButton" />
-            <attribute name="Layout Mode" value="Horizontal" />
-            <attribute name="Layout Border" value="1 1 1 1" />
-            <element type="Text">
-                <attribute name="Text" value="Sort" />
-                <attribute name="Text Alignment" value="Center" />
-            </element>
-        </element>
-    </element>
-    <element type="BorderImage" style="EditorDivider" />
-    <element type="Text">
-        <attribute name="Text" value="Textures" />
-    </element>
-    <element type="ListView">
-        <attribute name="Name" value="TextureList" />
-    </element>
-    <element type="BorderImage" style="EditorDivider" />
-    <element type="Text">
-        <attribute name="Text" value="Shader parameters" />
-    </element>
-    <element type="ListView">
-        <attribute name="Name" value="ShaderParameterList" />
-    </element>
-    <element>
-        <attribute name="Min Size" value="0 17" />
-        <attribute name="Max Size" value="2147483647 17" />
-        <attribute name="Layout Mode" value="Horizontal" />
-        <element type="LineEdit">
-            <attribute name="Name" value="ParameterNameEdit" />
-        </element>
-        <element type="DropDownList">
-            <attribute name="Name" value="NewParameterDropDown" />
-            <attribute name="Min Size" value="50 17" />
-            <attribute name="Max Size" value="50 17" />
-            <attribute name="Resize Popup" value="true" />
+    <element type="ListView" style="PanelView">
+        <attribute name="Min Size" value="0 60" />
+        <element type="BorderImage" internal="true">
             <element internal="true">
             <element internal="true">
-                <attribute name="Is Visible" value="false" />
-            </element>
-            <element type="Text">
-                <attribute name="Text" value="New" />
-                <attribute name="Text Alignment" value="Center" />
-            </element>
-            <!-- Skip style processing as the purpose of below tags is to populate the content element -->
-            <element type="Window" internal="true" popup="true" style="none">
-                <element type="ListView" internal="true" style="none">
-                    <element type="BorderImage" internal="true" style="none">
-                        <element internal="true" style="none">
-                            <element type="Text" style="EditorEnumAttributeText">
-                                <attribute name="Text" value="Float" />
-                            </element>
-                            <element type="Text" style="EditorEnumAttributeText">
-                                <attribute name="Text" value="Vector2" />
+                <element style="Panel">
+                    <element type="Text">
+                        <attribute name="Text" value="Techniques" />
+                    </element>
+                    <element type="ListView">
+                        <attribute name="Name" value="TechniqueList" />
+                        <attribute name="Min Size" value="0 100" />
+                    </element>
+                    <element>
+                        <attribute name="Name" value="TechniqueButtonContainer" />
+                        <attribute name="Min Size" value="0 16" />
+                        <attribute name="Max Size" value="2147483647 16" />
+                        <attribute name="Layout Mode" value="Horizontal" />
+                        <element type="Button">
+                            <attribute name="Name" value="NewTechniqueButton" />
+                            <attribute name="Layout Mode" value="Horizontal" />
+                            <attribute name="Layout Border" value="1 1 1 1" />
+                            <element type="Text">
+                                <attribute name="Text" value="New" />
+                                <attribute name="Text Alignment" value="Center" />
                             </element>
                             </element>
-                            <element type="Text" style="EditorEnumAttributeText">
-                                <attribute name="Text" value="Vector3" />
+                        </element>
+                        <element type="Button">
+                            <attribute name="Name" value="DeleteTechniqueButton" />
+                            <attribute name="Layout Mode" value="Horizontal" />
+                            <attribute name="Layout Border" value="1 1 1 1" />
+                            <element type="Text">
+                                <attribute name="Text" value="Del" />
+                                <attribute name="Text Alignment" value="Center" />
                             </element>
                             </element>
-                            <element type="Text" style="EditorEnumAttributeText">
-                                <attribute name="Text" value="Vector4" />
+                        </element>
+                        <element type="Button">
+                            <attribute name="Name" value="SortTechniquesButton" />
+                            <attribute name="Layout Mode" value="Horizontal" />
+                            <attribute name="Layout Border" value="1 1 1 1" />
+                            <element type="Text">
+                                <attribute name="Text" value="Sort" />
+                                <attribute name="Text Alignment" value="Center" />
                             </element>
                             </element>
                         </element>
                         </element>
                     </element>
                     </element>
                 </element>
                 </element>
-            </element>
-        </element>
-        <element type="Button">
-            <attribute name="Name" value="DeleteParameterButton" />
-            <attribute name="Min Size" value="50 17" />
-            <attribute name="Max Size" value="50 17" />
-            <attribute name="Layout Mode" value="Vertical" />
-            <attribute name="Layout Border" value="1 1 1 1" />
-            <element type="Text">
-                <attribute name="Text" value="Del" />
-                <attribute name="Text Alignment" value="Center" />
-            </element>
-        </element>
-    </element>
-    <element type="BorderImage" style="EditorDivider" />
-    <element>
-        <attribute name="Min Size" value="0 16" />
-        <attribute name="Max Size" value="2147483647 16" />
-        <attribute name="Layout Mode" value="Horizontal" />
-        <attribute name="Layout Spacing" value="10" />
-        <element type="Text" style="EditorAttributeText">
-            <attribute name="Text" value="Constant bias" />
-        </element>
-        <element type="LineEdit">
-            <attribute name="Name" value="ConstantBiasEdit" />
-        </element>
-        <element type="Text" style="EditorAttributeText">
-            <attribute name="Text" value="Slope bias" />
-        </element>
-        <element type="LineEdit">
-            <attribute name="Name" value="SlopeBiasEdit" />
-        </element>
-    </element>
-    <element>
-        <attribute name="Min Size" value="0 16" />
-        <attribute name="Max Size" value="2147483647 16" />
-        <attribute name="Layout Mode" value="Horizontal" />
-        <attribute name="Layout Spacing" value="8" />
-        <element type="Text" style="EditorAttributeText">
-            <attribute name="Text" value="Cull mode" />
-        </element>
-        <element type="DropDownList">
-            <attribute name="Name" value="CullModeEdit" />
-            <attribute name="Resize Popup" value="true" />
-            <!-- Skip style processing as the purpose of below tags is to populate the content element -->
-            <element type="Window" internal="true" popup="true" style="none">
-                <element type="ListView" internal="true" style="none">
-                    <element type="BorderImage" internal="true" style="none">
-                        <element internal="true" style="none">
-                            <element type="Text" style="FileSelectorFilterText">
-                                <attribute name="Text" value="None" />
+                <element type="BorderImage" style="EditorDivider" />
+                <element style="Panel">
+                    <element type="Text">
+                        <attribute name="Text" value="Textures" />
+                    </element>
+                    <element type="ListView">
+                        <attribute name="Name" value="TextureList" />
+                        <attribute name="Min Size" value="0 180" />
+                    </element>
+                </element>
+                <element type="BorderImage" style="EditorDivider" />
+                <element style="Panel">
+                    <element type="Text">
+                        <attribute name="Text" value="Shader parameters" />
+                    </element>
+                    <element type="ListView">
+                        <attribute name="Name" value="ShaderParameterList" />
+                        <attribute name="Min Size" value="0 120" />
+                    </element>
+                    <element>
+                        <attribute name="Min Size" value="0 17" />
+                        <attribute name="Max Size" value="2147483647 17" />
+                        <attribute name="Layout Mode" value="Horizontal" />
+                        <element type="LineEdit">
+                            <attribute name="Name" value="ParameterNameEdit" />
+                        </element>
+                        <element type="DropDownList">
+                            <attribute name="Name" value="NewParameterDropDown" />
+                            <attribute name="Min Size" value="50 17" />
+                            <attribute name="Max Size" value="50 17" />
+                            <attribute name="Resize Popup" value="true" />
+                            <element internal="true">
+                                <attribute name="Is Visible" value="false" />
                             </element>
                             </element>
-                            <element type="Text" style="FileSelectorFilterText">
-                                <attribute name="Text" value="CCW" />
+                            <element type="Text">
+                                <attribute name="Text" value="New" />
+                                <attribute name="Text Alignment" value="Center" />
                             </element>
                             </element>
-                            <element type="Text" style="FileSelectorFilterText">
-                                <attribute name="Text" value="CW" />
+                            <!-- Skip style processing as the purpose of below tags is to populate the content element -->
+                            <element type="Window" internal="true" popup="true" style="none">
+                                <element type="ListView" internal="true" style="none">
+                                    <element type="BorderImage" internal="true" style="none">
+                                        <element internal="true" style="none">
+                                            <element type="Text" style="EditorEnumAttributeText">
+                                                <attribute name="Text" value="Float" />
+                                            </element>
+                                            <element type="Text" style="EditorEnumAttributeText">
+                                                <attribute name="Text" value="Vector2" />
+                                            </element>
+                                            <element type="Text" style="EditorEnumAttributeText">
+                                                <attribute name="Text" value="Vector3" />
+                                            </element>
+                                            <element type="Text" style="EditorEnumAttributeText">
+                                                <attribute name="Text" value="Vector4" />
+                                            </element>
+                                        </element>
+                                    </element>
+                                </element>
+                            </element>
+                        </element>
+                        <element type="Button">
+                            <attribute name="Name" value="DeleteParameterButton" />
+                            <attribute name="Min Size" value="50 17" />
+                            <attribute name="Max Size" value="50 17" />
+                            <attribute name="Layout Mode" value="Vertical" />
+                            <attribute name="Layout Border" value="1 1 1 1" />
+                            <element type="Text">
+                                <attribute name="Text" value="Del" />
+                                <attribute name="Text Alignment" value="Center" />
                             </element>
                             </element>
                         </element>
                         </element>
                     </element>
                     </element>
                 </element>
                 </element>
-            </element>
-        </element>
-        <element type="Text" style="EditorAttributeText">
-            <attribute name="Text" value="Shadow cull" />
-        </element>
-        <element type="DropDownList">
-            <attribute name="Name" value="ShadowCullModeEdit" />
-            <attribute name="Resize Popup" value="true" />
-            <!-- Skip style processing as the purpose of below tags is to populate the content element -->
-            <element type="Window" internal="true" popup="true" style="none">
-                <element type="ListView" internal="true" style="none">
-                    <element type="BorderImage" internal="true" style="none">
-                        <element internal="true" style="none">
-                            <element type="Text" style="FileSelectorFilterText">
-                                <attribute name="Text" value="None" />
-                            </element>
-                            <element type="Text" style="FileSelectorFilterText">
-                                <attribute name="Text" value="CCW" />
+                <element type="BorderImage" style="EditorDivider" />
+                <element style="Panel">
+                    <element>
+                        <attribute name="Min Size" value="0 16" />
+                        <attribute name="Max Size" value="2147483647 16" />
+                        <attribute name="Layout Mode" value="Horizontal" />
+                        <attribute name="Layout Spacing" value="10" />
+                        <element type="Text" style="EditorAttributeText">
+                            <attribute name="Text" value="Constant bias" />
+                        </element>
+                        <element type="LineEdit">
+                            <attribute name="Name" value="ConstantBiasEdit" />
+                        </element>
+                        <element type="Text" style="EditorAttributeText">
+                            <attribute name="Text" value="Slope bias" />
+                        </element>
+                        <element type="LineEdit">
+                            <attribute name="Name" value="SlopeBiasEdit" />
+                        </element>
+                    </element>
+                    <element>
+                        <attribute name="Min Size" value="0 16" />
+                        <attribute name="Max Size" value="2147483647 16" />
+                        <attribute name="Layout Mode" value="Horizontal" />
+                        <attribute name="Layout Spacing" value="8" />
+                        <element type="Text" style="EditorAttributeText">
+                            <attribute name="Text" value="Cull mode" />
+                        </element>
+                        <element type="DropDownList">
+                            <attribute name="Name" value="CullModeEdit" />
+                            <attribute name="Resize Popup" value="true" />
+                            <!-- Skip style processing as the purpose of below tags is to populate the content element -->
+                            <element type="Window" internal="true" popup="true" style="none">
+                                <element type="ListView" internal="true" style="none">
+                                    <element type="BorderImage" internal="true" style="none">
+                                        <element internal="true" style="none">
+                                            <element type="Text" style="FileSelectorFilterText">
+                                                <attribute name="Text" value="None" />
+                                            </element>
+                                            <element type="Text" style="FileSelectorFilterText">
+                                                <attribute name="Text" value="CCW" />
+                                            </element>
+                                            <element type="Text" style="FileSelectorFilterText">
+                                                <attribute name="Text" value="CW" />
+                                            </element>
+                                        </element>
+                                    </element>
+                                </element>
                             </element>
                             </element>
-                            <element type="Text" style="FileSelectorFilterText">
-                                <attribute name="Text" value="CW" />
+                        </element>
+                        <element type="Text" style="EditorAttributeText">
+                            <attribute name="Text" value="Shadow cull" />
+                        </element>
+                        <element type="DropDownList">
+                            <attribute name="Name" value="ShadowCullModeEdit" />
+                            <attribute name="Resize Popup" value="true" />
+                            <!-- Skip style processing as the purpose of below tags is to populate the content element -->
+                            <element type="Window" internal="true" popup="true" style="none">
+                                <element type="ListView" internal="true" style="none">
+                                    <element type="BorderImage" internal="true" style="none">
+                                        <element internal="true" style="none">
+                                            <element type="Text" style="FileSelectorFilterText">
+                                                <attribute name="Text" value="None" />
+                                            </element>
+                                            <element type="Text" style="FileSelectorFilterText">
+                                                <attribute name="Text" value="CCW" />
+                                            </element>
+                                            <element type="Text" style="FileSelectorFilterText">
+                                                <attribute name="Text" value="CW" />
+                                            </element>
+                                        </element>
+                                    </element>
+                                </element>
                             </element>
                             </element>
                         </element>
                         </element>
                     </element>
                     </element>

+ 61 - 0
Bin/Data/UI/EditorPreferencesDialog.xml

@@ -85,6 +85,67 @@
             <attribute name="Name" value="ShowTemporaryObject" />
             <attribute name="Name" value="ShowTemporaryObject" />
         </element>
         </element>
     </element>
     </element>
+
+
+    <element>
+        <attribute name="Min Size" value="0 17" />
+        <attribute name="Max Size" value="2147483647 17" />
+        <attribute name="Layout Mode" value="Horizontal" />
+        <attribute name="Layout Border" value="20 0 0 0" />
+        <element type="Text">
+            <attribute name="Text" value="Text label color" />
+        </element>
+    </element>
+    <element>
+        <attribute name="Min Size" value="0 17" />
+        <attribute name="Max Size" value="2147483647 17" />
+        <attribute name="Layout Mode" value="Horizontal" />
+        <attribute name="Layout Border" value="40 0 0 0" />
+        <element type="Text">
+            <attribute name="Text" value="Node item" />
+        </element>
+        <element type="LineEdit">
+            <attribute name="Name" value="NodeItemTextColor.r" />
+            <attribute name="Min Size" value="50 0" />
+            <attribute name="Max Size" value="50 2147483647" />
+        </element>
+        <element type="LineEdit">
+            <attribute name="Name" value="NodeItemTextColor.g" />
+            <attribute name="Min Size" value="50 0" />
+            <attribute name="Max Size" value="50 2147483647" />
+        </element>
+        <element type="LineEdit">
+            <attribute name="Name" value="NodeItemTextColor.b" />
+            <attribute name="Min Size" value="50 0" />
+            <attribute name="Max Size" value="50 2147483647" />
+        </element>
+    </element>
+    <element>
+        <attribute name="Min Size" value="0 17" />
+        <attribute name="Max Size" value="2147483647 17" />
+        <attribute name="Layout Mode" value="Horizontal" />
+        <attribute name="Layout Border" value="40 0 0 0" />
+        <element type="Text">
+            <attribute name="Text" value="Component item" />
+        </element>
+        <element type="LineEdit">
+            <attribute name="Name" value="ComponentItemTextColor.r" />
+            <attribute name="Min Size" value="50 0" />
+            <attribute name="Max Size" value="50 2147483647" />
+        </element>
+        <element type="LineEdit">
+            <attribute name="Name" value="ComponentItemTextColor.g" />
+            <attribute name="Min Size" value="50 0" />
+            <attribute name="Max Size" value="50 2147483647" />
+        </element>
+        <element type="LineEdit">
+            <attribute name="Name" value="ComponentItemTextColor.b" />
+            <attribute name="Min Size" value="50 0" />
+            <attribute name="Max Size" value="50 2147483647" />
+        </element>
+    </element>
+
+
     <element type="BorderImage" style="EditorDivider" />
     <element type="BorderImage" style="EditorDivider" />
     <element>
     <element>
         <attribute name="Min Size" value="0 17" />
         <attribute name="Min Size" value="0 17" />

+ 257 - 0
Bin/Data/UI/OldStyle.xml

@@ -0,0 +1,257 @@
+<elements>
+    <element type="BorderImage" >
+        <attribute name="Texture" value="Texture2D;Textures/OldUI.png" />
+    </element>
+    <element type="Button" style="BorderImage">
+        <attribute name="Size" value="16 16" />
+        <attribute name="Image Rect" value="16 0 32 16" />
+        <attribute name="Border" value="4 4 4 4" />
+        <attribute name="Pressed Image Offset" value="16 0" />
+        <attribute name="Hover Image Offset" value="0 16" />
+        <attribute name="Pressed Child Offset" value="-1 1" />
+    </element>
+    <element type="CheckBox" style="BorderImage">
+        <attribute name="Min Size" value="16 16" />
+        <attribute name="Max Size" value="16 16" />
+        <attribute name="Image Rect" value="64 0 80 16" />
+        <attribute name="Border" value="4 4 4 4" />
+        <attribute name="Checked Image Offset" value="16 0" />
+        <attribute name="Hover Image Offset" value="0 16" />
+    </element>
+    <element type="CloseButton" style="Button" auto="false">    <!-- non-auto style is shown explicitly in the Editor's style drop down list for user selection -->
+        <attribute name="Min Size" value="16 16" />
+        <attribute name="Max Size" value="16 16" />
+        <attribute name="Image Rect" value="128 0 144 16" />
+    </element>
+    <element type="Cursor">
+        <attribute name="Shapes">
+            <variant type="Int" value="8" />
+            <variant type="String" value="Normal" />
+            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
+            <variant type="IntRect" value="0 0 12 24" />
+            <variant type="IntVector2" value="0 0" />
+            <variant type="String" value="ResizeVertical" />
+            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
+            <variant type="IntRect" value="0 64 20 84" />
+            <variant type="IntVector2" value="9 9" />
+            <variant type="String" value="ResizeDiagonalTopRight" />
+            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
+            <variant type="IntRect" value="20 64 40 84" />
+            <variant type="IntVector2" value="9 9" />
+            <variant type="String" value="ResizeHorizontal" />
+            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
+            <variant type="IntRect" value="40 64 60 84" />
+            <variant type="IntVector2" value="9 9" />
+            <variant type="String" value="ResizeDiagonalTopLeft" />
+            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
+            <variant type="IntRect" value="60 64 80 84" />
+            <variant type="IntVector2" value="9 9" />
+            <variant type="String" value="RejectDrop" />
+            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
+            <variant type="IntRect" value="80 64 100 84" />
+            <variant type="IntVector2" value="9 9" />
+            <variant type="String" value="AcceptDrop" />
+            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
+            <variant type="IntRect" value="100 64 128 90" />
+            <variant type="IntVector2" value="0 0" />
+            <variant type="String" value="Busy" />
+            <variant type="ResourceRef" value="Image;Textures/OldUI.png" />
+            <variant type="IntRect" value="128 64 148 85" />
+            <variant type="IntVector2" value="9 9" />
+        </attribute>
+    </element>
+    <element type="DropDownList" style="BorderImage">
+        <attribute name="Image Rect" value="16 0 32 16" />
+        <attribute name="Border" value="4 4 4 4" />
+        <attribute name="Pressed Image Offset" value="16 0" />
+        <attribute name="Hover Image Offset" value="0 16" />
+        <attribute name="Pressed Child Offset" value="-1 1" />
+        <attribute name="Layout Mode" value="Horizontal" />
+        <attribute name="Layout Border" value="4 1 4 1" />
+        <element internal="true">
+            <element type="Text" internal="true" />
+        </element>
+        <element type="Window" internal="true" popup="true">
+            <attribute name="Layout Border" value="2 2 2 2" />
+            <element type="ListView" internal="true">
+                <attribute name="Highlight Mode" value="Always" />
+                <element type="BorderImage" internal="true">    <!-- Override scroll panel attributes from default ListView -->
+                    <attribute name="Image Rect" value="96 0 112 16" />
+                    <attribute name="Border" value="2 2 2 2" />
+                </element>
+            </element>
+        </element>
+    </element>
+    <element type="LineEdit" style="BorderImage">
+        <attribute name="Image Rect" value="112 0 128 16" />
+        <attribute name="Border" value="2 2 2 2" />
+        <attribute name="Clip Border" value="1 1 1 1" />
+        <attribute name="Hover Image Offset" value="0 16" />    <!-- Background color of the hover image IS the hover color of LineEdit -->
+        <element type="Text" internal="true">
+            <attribute name="Selection Color" value="0.7 0.7 0.7 1" />
+        </element>
+        <element type="BorderImage" internal="true">
+            <attribute name="Size" value="4 16" />
+            <attribute name="Priority" value="1" />
+            <attribute name="Image Rect" value="12 0 16 16" />
+        </element>
+    </element>
+    <element type="ListView" style="ScrollView" />  <!-- Shortcut to copy all the styles from ScrollView -->
+    <element type="ListViewHierarchyOverlay" style="BorderImage">
+        <attribute name="Min Size" value="16 16" />
+        <attribute name="Max Size" value="16 16" />
+        <attribute name="Image Rect" value="160 0 176 16" />
+        <attribute name="Checked Image Offset" value="16 0" />
+        <attribute name="Hover Image Offset" value="0 16" />
+    </element>
+    <element type="Menu" style="BorderImage">
+        <attribute name="Image Rect" value="96 0 112 16" />
+        <attribute name="Border" value="2 2 2 2" />
+        <attribute name="Pressed Image Offset" value="16 0" />
+        <attribute name="Hover Image Offset" value="0 16" />
+    </element>
+    <element type="ScrollBar">
+        <attribute name="Left Image Rect" value="32 32 48 48" />
+        <attribute name="Up Image Rect" value="0 32 16 48" />
+        <attribute name="Right Image Rect" value="48 32 64 48" />
+        <attribute name="Down Image Rect" value="16 32 32 48" />
+        <element type="Button" internal="true">
+            <attribute name="Size" value="12 12" />
+            <attribute name="Border" value="3 3 3 3" />
+            <attribute name="Pressed Image Offset" value="64 0" />
+            <attribute name="Hover Image Offset" value="0 16" />
+        </element>
+        <element type="Slider" internal="true">
+            <attribute name="Size" value="12 12" />
+            <attribute name="Image Rect" value="112 0 128 16" />
+            <attribute name="Border" value="3 3 3 3" />
+            <element type="BorderImage" internal="true">
+                <attribute name="Image Rect" value="48 0 64 16" />
+                <attribute name="Border" value="4 4 4 4" />
+                <attribute name="Hover Image Offset" value="0 16" />
+            </element>
+        </element>
+        <element type="Button" internal="true">
+            <attribute name="Size" value="12 12" />
+            <attribute name="Border" value="3 3 3 3" />
+            <attribute name="Pressed Image Offset" value="64 0" />
+            <attribute name="Hover Image Offset" value="0 16" />
+        </element>
+    </element>
+    <element type="ScrollView">
+        <element type="ScrollBar" internal="true">
+            <attribute name="Size" value="0 12" />
+        </element>
+        <element type="ScrollBar" internal="true">
+            <attribute name="Size" value="12 0" />
+        </element>
+        <element type="BorderImage" internal="true">
+            <attribute name="Image Rect" value="112 0 128 16" />
+            <attribute name="Border" value="2 2 2 2" />
+            <attribute name="Clip Border" value="1 1 1 1" />
+        </element>
+    </element>
+    <element type="Slider" style="BorderImage">
+        <attribute name="Size" value="12 12" />
+        <attribute name="Image Rect" value="112 0 128 16" />
+        <attribute name="Border" value="3 3 3 3" />
+        <element type="BorderImage" internal="true">
+            <attribute name="Image Rect" value="48 0 64 16" />
+            <attribute name="Border" value="4 4 4 4" />
+            <attribute name="Hover Image Offset" value="0 16" />
+        </element>
+    </element>
+    <element type="Window" style="BorderImage">
+        <attribute name="Image Rect" value="48 0 64 16" />
+        <attribute name="Border" value="3 3 3 3" />
+        <attribute name="Resize Border" value="8 8 8 8" />
+    </element>
+    <element type="Text">
+        <attribute name="Font" value="Font;Fonts/Anonymous Pro.ttf" />
+        <attribute name="Font Size" value="11" />
+    </element>
+    <element type="DebugHudText" style="Text" auto="false" />
+    <element type="ConsoleBackground" auto="false">
+        <attribute name="Top Left Color" value="0 0.25 0 0.75" />
+        <attribute name="Top Right Color" value="0 0.25 0 0.75" />
+        <attribute name="Bottom Left Color" value="0.25 0.75 0.25 0.75" />
+        <attribute name="Bottom Right Color" value="0.25 0.75 0.25 0.75" />
+        <attribute name="Layout Border" value="4 4 4 4" />
+    </element>
+    <element type="ConsoleText" style="Text" auto="false" />
+    <element type="ConsoleHighlightedText" style="Text" auto="false">
+        <attribute name="Color" value="0.75 0 0 1" />
+    </element>
+    <element type="ConsoleLineEdit" style="LineEdit" auto="false">
+        <attribute name="Top Left Color" value="0 0 0 0.5" />
+        <attribute name="Top Right Color" value="0 0 0 0.5" />
+        <attribute name="Bottom Left Color" value="0 0 0 0.5" />
+        <attribute name="Bottom Right Color" value="0 0 0 0.5" />
+        <element type="Text" internal="true" style="none">
+            <attribute name="Selection Color" value="0 0.5 0 0.75" />
+        </element>
+    </element>
+    <element type="FileSelector" style="Window" auto="false">
+        <attribute name="Size" value="400 300" />
+        <attribute name="Is Movable" value="true" />
+        <attribute name="Is Resizable" value="true" />
+        <attribute name="Resize Border" value="6 6 6 6" />
+        <attribute name="Layout Mode" value="vertical" />
+        <attribute name="Layout Spacing" value="4" />
+        <attribute name="Layout Border" value="6 6 6 6" />
+        <attribute name="Modal Shade Color" value="0.45 0.70 0.45 0.05" />
+        <attribute name="Modal Frame Color" value="0.45 0.70 0.45" />
+        <attribute name="Modal Frame Size" value="2 2" />
+    </element>
+    <element type="FileSelectorButton" style="Button" auto="false">
+        <attribute name="Min Size" value="80 22" />
+        <attribute name="Max Size" value="80 22" />
+    </element>
+    <element type="FileSelectorButtonText" style="Text" auto="false" />
+    <element type="FileSelectorListView" style="ListView" auto="false" />
+    <element type="FileSelectorLineEdit" style="LineEdit" auto="false" />
+    <element type="FileSelectorFilterList" style="DropDownList" auto="false">
+        <attribute name="Min Size" value="64 0" />
+        <attribute name="Max Size" value="64 2147483647" />
+        <attribute name="Resize Popup" value="true" />
+    </element>
+    <element type="FileSelectorFilterText" style="Text" auto="false">
+        <attribute name="Is Enabled" value="true" />
+        <attribute name="Selection Color" value="0.7 0.7 0.7 1" />
+        <attribute name="Hover Color" value="0.45 0.7 0.45 1" />
+    </element>
+    <element type="FileSelectorTitleLayout" auto="false">
+        <attribute name="Min Size" value="0 16" />
+        <attribute name="Max Size" value="2147483647 16" />
+        <attribute name="Layout Spacing" value="4" />
+    </element>
+    <element type="FileSelectorLayout" auto="false">
+        <attribute name="Layout Spacing" value="4" />
+    </element>
+    <element type="FileSelectorListText" style="Text" auto="false">
+        <attribute name="Hover Color" value="0.45 0.7 0.45 1" />
+        <attribute name="Selection Color" value="0.7 0.7 0.7 1" />
+    </element>
+    <element type="FileSelectorTitleText" style="Text" auto="false" />
+    <element type="EditorDivider" style="BorderImage" auto="false">
+        <attribute name="Image Rect" value="144 32 160 43" />
+        <attribute name="Border" value="2 2 2 2" />
+        <attribute name="Min Size" value="0 11" />
+        <attribute name="Max Size" value="2147483647 11" />
+    </element>
+    <element type="EditorMenuBar" style="BorderImage" auto="false">
+        <attribute name="Image Rect" value="96 0 112 16" />
+        <attribute name="Border" value="2 2 2 2" />
+    </element>
+    <element type="EditorMenuText" style="Text" auto="false" />
+    <element type="EditorAttributeText" auto="false">
+        <attribute name="Font" value="Font;Fonts/BlueHighway.ttf" />
+        <attribute name="Font Size" value="12" />
+    </element>
+    <element type="EditorEnumAttributeText" style="EditorAttributeText" auto="false">
+        <attribute name="Is Enabled" value="true" />
+        <attribute name="Selection Color" value="0.7 0.7 0.7 1" />
+        <attribute name="Hover Color" value="0.45 0.7 0.45 1" />
+    </element>
+    <element type="EditorAttributeEdit" style="LineEdit" auto="false" />
+</elements>