From ceea51fe9f2f6f0f0c4f304b3b95887d10266b32 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 22 Mar 2012 13:29:54 +0100
Subject: [PATCH] fixed TextEdit, TextBoxEdit, DispositionEdit

---
 extern/mygui_3.0.1/CMakeLists.txt             |  1 +
 extern/mygui_3.0.1/openmw_resources/core.xml  |  1 +
 .../openmw_dialogue_window_skin.xml           | 13 ++-----
 .../openmw_resources/openmw_edit.skin.xml     |  9 +----
 .../openmw_resources/openmw_widgetbase.xml    | 38 +++++++++++++++++++
 extern/mygui_3.0.1/openmw_resources/test.skin |  8 ++++
 6 files changed, 54 insertions(+), 16 deletions(-)
 create mode 100644 extern/mygui_3.0.1/openmw_resources/openmw_widgetbase.xml
 create mode 100644 extern/mygui_3.0.1/openmw_resources/test.skin

diff --git a/extern/mygui_3.0.1/CMakeLists.txt b/extern/mygui_3.0.1/CMakeLists.txt
index b746587f58..c94aaf727e 100644
--- a/extern/mygui_3.0.1/CMakeLists.txt
+++ b/extern/mygui_3.0.1/CMakeLists.txt
@@ -11,6 +11,7 @@ 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 30e01a8f3d..176225c8d4 100644
--- a/extern/mygui_3.0.1/openmw_resources/core.xml
+++ b/extern/mygui_3.0.1/openmw_resources/core.xml
@@ -4,6 +4,7 @@
 
       <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_dialogue_window_skin.xml b/extern/mygui_3.0.1/openmw_resources/openmw_dialogue_window_skin.xml
index 9847abd81f..afaa97c573 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,16 +3,11 @@
 <MyGUI type="Skin">
 
     <Skin name = "MW_DispEdit" size = "10 10">
-        <Property key="FontName" value = "MonoFont" />
-        <Property key="AlignText" value = "Left Top" />
-        <Property key="TextColour" value = "0000FF" />
-        <!--Property key="Pointer" value = "beam" /-->
         <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
     </Skin>
-	
-    <Skin name="MW_DispositionEdit" size="0 0 50 50">
-        <Property key="WordWrap" value = "true" />
-        <Child type="Widget" skin="MW_DispEdit" 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 name="MW_DispEditRootSkin" size="50 50">
+        <BasisSkin type="EditText" offset = "0 0 50 50" align = "Stretch"/>
     </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 5d61181bd6..91faed9a03 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
@@ -20,7 +20,7 @@
         <BasisSkin type="EditText" offset = "0 0 10 10" align = "Stretch"/>
     </Skin>
 
-    <Skin name = "MW_TextEdit" size = "512 20"  texture="mwgui.png">
+    <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,11 +33,9 @@
         <BasisSkin type="SubSkin" offset = "0 18 512 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
             <State name="normal" offset = "2 20 512 2"/>
         </BasisSkin>
-
-        <Child type="Widget" skin="MW_TextEditClient" offset = "2 2 508 18" align = "Stretch" name = "Client"/>
     </Skin>
 
-    <Skin name = "MW_TextBoxEdit" size = "512 20"  texture="mwgui.png">
+    <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>
@@ -50,8 +48,5 @@
         <BasisSkin type="SubSkin" offset = "0 18 512 2" align = "ALIGN_BOTTOM ALIGN_HSTRETCH">
             <State name="normal" offset = "2 20 512 2"/>
         </BasisSkin>
-
-        <Child type="Widget" skin="MW_TextBoxEditClient" offset = "2 2 490 18" align = "Stretch" name = "Client"/>
-        <Child type="VScroll" 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
new file mode 100644
index 0000000000..3e2e4089b3
--- /dev/null
+++ b/extern/mygui_3.0.1/openmw_resources/openmw_widgetbase.xml
@@ -0,0 +1,38 @@
+<?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="VScroll" 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>
diff --git a/extern/mygui_3.0.1/openmw_resources/test.skin b/extern/mygui_3.0.1/openmw_resources/test.skin
new file mode 100644
index 0000000000..5f198ab4a0
--- /dev/null
+++ b/extern/mygui_3.0.1/openmw_resources/test.skin
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<MyGUI type="Resource" version="1.1">
+    <Resource type="ResourceSkin" name="Skin name 0" size="32 32" texture="">
+        <BasisSkin type="SubSkin" offset="0 0 32 32" align="Stretch">
+            <State name="normal" offset="0 0 32 32"/>
+        </BasisSkin>
+    </Resource>
+</MyGUI>