From ba0acd4056292e4d18d56f9f5fa0ee1d86c7ccea Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Mon, 10 Sep 2012 13:52:37 +0200
Subject: [PATCH] changed some text colors

---
 apps/openmw/mwgui/spellbuyingwindow.cpp       |  5 -----
 files/mygui/openmw_button.skin.xml            |  2 +-
 files/mygui/openmw_spell_buying_window.layout |  3 ++-
 files/mygui/openmw_text.skin.xml              | 10 +++++-----
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/apps/openmw/mwgui/spellbuyingwindow.cpp b/apps/openmw/mwgui/spellbuyingwindow.cpp
index 59d811335..55a885512 100644
--- a/apps/openmw/mwgui/spellbuyingwindow.cpp
+++ b/apps/openmw/mwgui/spellbuyingwindow.cpp
@@ -44,11 +44,6 @@ namespace MWGui
 
         mCancelButton->eventMouseButtonClick += MyGUI::newDelegate(this, &SpellBuyingWindow::onCancelButtonClicked);
 
-        int cancelButtonWidth = mCancelButton->getTextSize().width + 24;
-        mCancelButton->setCoord(430-cancelButtonWidth,
-                                mCancelButton->getTop(),
-                                cancelButtonWidth,
-                                mCancelButton->getHeight());
         mSpells->setCoord(450/2-mSpells->getTextSize().width/2,
                           mSpells->getTop(),
                           mSpells->getTextSize().width,
diff --git a/files/mygui/openmw_button.skin.xml b/files/mygui/openmw_button.skin.xml
index 491b3f47b..2895d52cc 100644
--- a/files/mygui/openmw_button.skin.xml
+++ b/files/mygui/openmw_button.skin.xml
@@ -74,7 +74,7 @@
         <Child type="Widget" skin="BTN_BottomRight" offset="132 20 4 4" align="ALIGN_BOTTOM ALIGN_RIGHT"/>
 
         <BasisSkin type="SimpleText" offset="4 4 128 16" align="ALIGN_STRETCH">
-            <State name="disabled" colour="0.5 0.5 0.5" shift="0"/>
+            <State name="disabled" colour="0.6 0.56 0.45" shift="0"/>
             <State name="normal" colour="0.75 0.6 0.35" shift="0"/>
             <State name="highlighted" colour="0.85 0.76 0.60" shift="0"/>
             <State name="pushed" colour="1 1 1" shift="0"/>
diff --git a/files/mygui/openmw_spell_buying_window.layout b/files/mygui/openmw_spell_buying_window.layout
index 6b45b231c..ccbaf5f3a 100644
--- a/files/mygui/openmw_spell_buying_window.layout
+++ b/files/mygui/openmw_spell_buying_window.layout
@@ -24,7 +24,8 @@
         <Widget type="TextBox" skin="SandText" position="8 255 24 24" name="PlayerGold" align="Right Top">
             <Property key="TextAlign" value="Right"/>
         </Widget>
-        <Widget type="Button" skin="MW_Button" position="290 260 60 24" name="CancelButton" align="Right Top">
+        <Widget type="AutoSizedButton" skin="MW_Button" position="375 260 60 24" name="CancelButton" align="Right Top">
+            <Property key="ExpandDirection" value="Left"/>
             <Property key="Caption" value="#{sOK}"/>
         </Widget>
 
diff --git a/files/mygui/openmw_text.skin.xml b/files/mygui/openmw_text.skin.xml
index 3e1a977e5..13b22ff93 100644
--- a/files/mygui/openmw_text.skin.xml
+++ b/files/mygui/openmw_text.skin.xml
@@ -81,7 +81,7 @@
         <Property key="FontName" value = "Default" />
         <Property key="TextAlign" value = "Top HCenter" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH">
-            <State name="disabled" colour="0.5 0.5 0.5" shift="0"/>
+            <State name="disabled" colour="0.6 0.56 0.45" shift="0"/>
             <State name="normal" colour="0.75 0.6 0.35" shift="0"/>
             <State name="highlighted" colour="0.85 0.76 0.60" shift="0"/>
             <State name="pushed" colour="1 1 1" shift="0"/>
@@ -96,7 +96,7 @@
         <Property key="FontName" value = "Default" />
         <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_BOTTOM" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH">
-            <State name="disabled" colour="0.5 0.5 0.5" shift="0"/>
+            <State name="disabled" colour="0.6 0.56 0.45" shift="0"/>
             <State name="normal" colour="0.75 0.6 0.35" shift="0"/>
             <State name="highlighted" colour="0.85 0.76 0.60" shift="0"/>
             <State name="pushed" colour="1 1 1" shift="0"/>
@@ -111,7 +111,7 @@
         <Property key="FontName" value = "Default" />
         <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_BOTTOM" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH">
-            <State name="disabled" colour="0.5 0.5 0.5" shift="0"/>
+            <State name="disabled" colour="0.6 0.56 0.45" shift="0"/>
             <State name="normal" colour="0.75 0.6 0.35" shift="0"/>
             <State name="highlighted" colour="0.85 0.76 0.60" shift="0"/>
             <State name="pushed" colour="1 1 1" shift="0"/>
@@ -126,8 +126,8 @@
         <Property key="FontName" value = "Default" />
         <Property key="TextAlign" value = "ALIGN_LEFT ALIGN_BOTTOM" />
         <BasisSkin type="SimpleText" offset = "0 0 16 16"  align = "ALIGN_STRETCH">
-            <State name="disabled" colour="0.5 0.5 0.5" shift="0"/>
-            <State name="normal" colour="0.5 0.5 0.5" shift="0"/>
+            <State name="disabled" colour="0.6 0.56 0.45" shift="0"/>
+            <State name="normal" colour="0.6 0.56 0.45" shift="0"/>
             <State name="highlighted" colour="0.85 0.76 0.60" shift="0"/>
             <State name="pushed" colour="1 1 1" shift="0"/>
             <State name="disabled_checked" colour="0.33 0.38 0.67" shift="0"/>