From 75d5714fe0fd48926d96eaa2ad5dc95c40af2f6e Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 22 Mar 2012 16:45:27 +0100
Subject: [PATCH] TextEdit, TextBoxEdit, DispEdit fix more consistent

---
 extern/mygui_3.0.1/CMakeLists.txt             |  1 -
 extern/mygui_3.0.1/openmw_resources/core.xml  |  1 -
 .../openmw_resources/openmw_console.skin.xml  |  4 +-
 .../openmw_dialogue_window_skin.xml           | 10 ++++-
 .../openmw_resources/openmw_edit.skin.xml     | 45 ++++++++++---------
 .../openmw_resources/openmw_widgetbase.xml    | 38 ----------------
 6 files changed, 35 insertions(+), 64 deletions(-)
 delete mode 100644 extern/mygui_3.0.1/openmw_resources/openmw_widgetbase.xml

diff --git a/extern/mygui_3.0.1/CMakeLists.txt b/extern/mygui_3.0.1/CMakeLists.txt
index c94aaf727e..b746587f58 100644
--- a/extern/mygui_3.0.1/CMakeLists.txt
+++ b/extern/mygui_3.0.1/CMakeLists.txt
@@ -11,7 +11,6 @@ configure_file("${SDIR}/core.skin" "${DDIR}/core.skin" COPYONLY)
 configure_file("${SDIR}/core.xml" "${DDIR}/core.xml" COPYONLY)
 configure_file("${SDIR}/mwpointer.png" "${DDIR}/mwpointer.png" COPYONLY)
 configure_file("${SDIR}/mwgui.png" "${DDIR}/mwgui.png" COPYONLY)
-configure_file("${SDIR}/openmw_widgetbase.xml" "${DDIR}/openmw_widgetbase.xml" COPYONLY)
 configure_file("${SDIR}/openmw_images.xml" "${DDIR}/openmw_images.xml" COPYONLY)
 configure_file("${SDIR}/openmw_settings.xml" "${DDIR}/openmw_settings.xml" COPYONLY)
 configure_file("${SDIR}/openmw_box.skin.xml" "${DDIR}/openmw_box.skin.xml" COPYONLY)
diff --git a/extern/mygui_3.0.1/openmw_resources/core.xml b/extern/mygui_3.0.1/openmw_resources/core.xml
index 176225c8d4..30e01a8f3d 100644
--- a/extern/mygui_3.0.1/openmw_resources/core.xml
+++ b/extern/mygui_3.0.1/openmw_resources/core.xml
@@ -4,7 +4,6 @@
 
       <MyGUI type="List">
             <List file="core.skin" group="General"/>
-            <List file="openmw_widgetbase.xml" group="General"/>
             <List file="openmw_images.xml" group="General"/>
             <List file="openmw_layers.xml" group="General"/>
             <List file="openmw.pointer.xml" group="General"/>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml
index 3c72302d60..a15058bd2d 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_console.skin.xml
@@ -48,14 +48,14 @@
 
     <!-- The edit control used for entering commands -->
     <Skin name = "MW_ConsoleCommand" size = "29 26">
-        <Child type="EditBox" skin="MW_EditClient" offset = "2 1 23 22" align = "Stretch" name = "Client"/>
+        <Child type="TextBox" skin="MW_EditClient" offset = "2 1 23 22" align = "Stretch" name = "Client"/>
 
         <Child type="Widget" skin="MW_BarFrame" offset="0 0 29 26" align="ALIGN_STRETCH"/>
     </Skin>
 
     <Skin name="MW_ConsoleLog" size="0 0 50 50">
         <Property key="WordWrap" value = "true" />
-        <Child type="EditBox" skin="MW_LogClient" offset="0 0 35 10" align = "ALIGN_STRETCH" name = "Client"/>
+        <Child type="TextBox" skin="MW_LogClient" offset="0 0 35 10" align = "ALIGN_STRETCH" name = "Client"/>
         <!--Child type="VScroll" skin="VScroll" offset = "35 0 15 50" align = "Right VStretch" name = "VScroll"/-->
     </Skin>
 
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_skin.xml
index afaa97c573..a879b91a14 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_skin.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_skin.xml
@@ -3,11 +3,17 @@
 <MyGUI type="Skin">
 
     <Skin name = "MW_DispEdit" size = "10 10">
+        <!--Property key="Pointer" value = "beam" /-->
         <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
     </Skin>
 
-    <Skin name="MW_DispEditRootSkin" size="50 50">
-        <BasisSkin type="EditText" offset = "0 0 50 50" align = "Stretch"/>
+    <Skin name="MW_DispositionEdit" size="0 0 50 50">
+        <Property key="FontName" value = "MonoFont" />
+        <Property key="AlignText" value = "Left Top" />
+        <Property key="Colour" value = "0000FF" />
+        <Property key="Static" value="1" />
+        <Property key="WordWrap" value = "true" />
+        <Child type="TextBox" skin="MW_DispEdit" offset="0 0 35 10" align = "ALIGN_STRETCH" name = "Client"/>
     </Skin>
     
 </MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_edit.skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_edit.skin.xml
index 91faed9a03..2e04894ffa 100644
--- a/extern/mygui_3.0.1/openmw_resources/openmw_edit.skin.xml
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_edit.skin.xml
@@ -3,24 +3,41 @@
 <MyGUI type="Skin">
     <!-- Text edit widget -->
     <Skin name = "MW_TextEditClient" size = "10 10">
+        <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
+    </Skin>
+
+    <Skin name = "MW_TextBoxEditClient" size = "10 10">
+        <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
+    </Skin>
+
+    <Skin name="MW_TextEdit" size="512 20" texture="mwgui.png">
         <Property key="FontName" value = "MyGUI_CoreFont.18"/>
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "ALIGN_LEFT ALIGN_VCENTER" />
         <Property key="TextColour" value = "0.6 0.6 0.6" />
 
-        <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
+        <BasisSkin type="SubSkin" offset = "0 0 512 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
+            <State name="normal" offset = "2 2 512 2"/>
+        </BasisSkin>
+        <BasisSkin type="SubSkin" offset = "0 2 2 16" align = "ALIGN_LEFT ALIGN_VSTRETCH">
+            <State name="normal" offset = "2 4 2 16"/>
+        </BasisSkin>
+        <BasisSkin type="SubSkin" offset = "510 2 2 16" align = "ALIGN_RIGHT ALIGN_VSTRETCH">
+            <State name="normal" offset = "512 4 2 16"/>
+        </BasisSkin>
+        <BasisSkin type="SubSkin" offset = "0 18 512 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
+            <State name="normal" offset = "2 20 512 2"/>
+        </BasisSkin>
+
+        <Child type="TextBox" skin="MW_TextEditClient" offset = "2 2 508 18" align = "Stretch" name = "Client"/>
     </Skin>
 
-    <Skin name = "MW_TextBoxEditClient" size = "10 10">
+    <Skin name="MW_TextBoxEdit" size="512 20" texture="mwgui.png">
         <Property key="FontName" value = "MyGUI_CoreFont.18"/>
         <Property key="FontHeight" value = "18" />
         <Property key="AlignText" value = "ALIGN_LEFT ALIGN_TOP" />
         <Property key="TextColour" value = "0.6 0.6 0.6" />
 
-        <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
-    </Skin>
-
-    <Skin name="MW_TextEditRootSkin" size="512 20" texture="mwgui.png">
         <BasisSkin type="SubSkin" offset = "0 0 512 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
             <State name="normal" offset = "2 2 512 2"/>
         </BasisSkin>
@@ -33,20 +50,8 @@
         <BasisSkin type="SubSkin" offset = "0 18 512 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
             <State name="normal" offset = "2 20 512 2"/>
         </BasisSkin>
-    </Skin>
 
-    <Skin name="MW_TextBoxEditRootSkin" size="512 20" texture="mwgui.png">
-        <BasisSkin type="SubSkin" offset = "0 0 512 2" align = "ALIGN_TOP ALIGN_HSTRETCH">
-            <State name="normal" offset = "2 2 512 2"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 2 2 16" align = "ALIGN_LEFT ALIGN_VSTRETCH">
-            <State name="normal" offset = "2 4 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "510 2 2 16" align = "ALIGN_RIGHT ALIGN_VSTRETCH">
-            <State name="normal" offset = "512 4 2 16"/>
-        </BasisSkin>
-        <BasisSkin type="SubSkin" offset = "0 18 512 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
-            <State name="normal" offset = "2 20 512 2"/>
-        </BasisSkin>
+        <Child type="TextBox" skin="MW_TextBoxEditClient" offset = "2 2 490 18" align = "Stretch" name = "Client"/>	  	
+        <Child type="ScrollBar" skin="MW_VScroll" offset = "494 3 14 14" align = "Right VStretch" name = "VScroll"/>
     </Skin>
 </MyGUI>
diff --git a/extern/mygui_3.0.1/openmw_resources/openmw_widgetbase.xml b/extern/mygui_3.0.1/openmw_resources/openmw_widgetbase.xml
deleted file mode 100644
index bde33adb9b..0000000000
--- a/extern/mygui_3.0.1/openmw_resources/openmw_widgetbase.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<MyGUI type="Resource">
-    <Resource type="ResourceLayout" name="MW_TextEdit" version="3.2.0">
-        <Widget type="Widget" skin="MW_TextEditRootSkin" position="0 0 510 20" name="Root">
-            <Widget type="TextBox" skin="MW_TextEditClient" position="2 2 508 18" align="Stretch" name="Client">
-                <Property key="FontName" value = "MyGUI_CoreFont.18"/>
-                <Property key="FontHeight" value = "18" />
-                <Property key="AlignText" value = "ALIGN_LEFT ALIGN_TOP" />
-                <Property key="TextColour" value = "0.6 0.6 0.6" />
-            </Widget>
-        </Widget>
-    </Resource>
-
-    <Resource type="ResourceLayout" name="MW_TextBoxEdit" version="3.2.0">
-        <Widget type="Widget" skin="MW_TextBoxEditRootSkin" position="0 0 510 20" name="Root">
-            <Widget type="TextBox" skin="MW_TextBoxEditClient" position="2 2 490 18" align="Stretch" name="Client">
-                <Property key="FontName" value = "MyGUI_CoreFont.18"/>
-                <Property key="FontHeight" value = "18" />
-                <Property key="AlignText" value = "ALIGN_LEFT ALIGN_TOP" />
-                <Property key="TextColour" value = "0.6 0.6 0.6" />
-            </Widget>
-            <Widget type="ScrollBar" skin="MW_VScroll" position="494 3 14 14" align="Right VStretch" name="VScroll"/>
-        </Widget>
-    </Resource>
-
-    <Resource type="ResourceLayout" name="MW_DispositionEdit" version="3.2.0">
-        <Widget type="Widget" skin="MW_DispEditRootSkin" position="0 0 50 50" name="Root">
-            <Widget type="TextBox" skin="MW_DispEdit" position="0 0 50 50" align="ALIGN_STRETCH" name="Client">
-                <Property key="FontName" value = "MyGUI_CoreFont.18" />
-                <Property key="FontHeight" value = "18" />
-                <Property key="AlignText" value = "Left Top" />
-                <Property key="TextColour" value = "0000FF" />
-                <!--Property key="Pointer" value = "beam" /-->
-            </Widget>
-        </Widget>
-    </Resource>
-</MyGUI>