From 4150f81fd2bd2de6251f0bdf05361922c63713e5 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 23 May 2018 01:46:59 +0300
Subject: Add textOffsetY skin field into spell shortcut container.

Before it used box/2 as offset.
---
 data/graphics/gui/spells.xml               | 2 ++
 data/themes/enchilado/spells.xml           | 2 ++
 data/themes/golden-delicious/spells.xml    | 1 +
 data/themes/jewelry-simple/spells.xml      | 1 +
 data/themes/jewelry/spells.xml             | 1 +
 data/themes/pink/spells.xml                | 2 ++
 data/themes/unity/spells.xml               | 2 ++
 src/gui/widgets/spellshortcutcontainer.cpp | 4 ++--
 8 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/data/graphics/gui/spells.xml b/data/graphics/gui/spells.xml
index 4ad70a5a8..502e7fcdf 100644
--- a/data/graphics/gui/spells.xml
+++ b/data/graphics/gui/spells.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window">
+        <option name="textOffsetY" value="21" /> 
+
         <!-- Top Row -->
         <part type="top-left-corner" xpos="0" ypos="0" width="4" height="4" />
         <part type="top-edge" xpos="4" ypos="0" width="32" height="4" />
diff --git a/data/themes/enchilado/spells.xml b/data/themes/enchilado/spells.xml
index c4e12e15c..389764ca1 100644
--- a/data/themes/enchilado/spells.xml
+++ b/data/themes/enchilado/spells.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="190" ypos="30">
+        <option name="textOffsetY" value="21" /> 
+
         <!-- Top Row -->
         <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
         <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
diff --git a/data/themes/golden-delicious/spells.xml b/data/themes/golden-delicious/spells.xml
index efe7afeb3..762832b05 100644
--- a/data/themes/golden-delicious/spells.xml
+++ b/data/themes/golden-delicious/spells.xml
@@ -6,6 +6,7 @@
         <option name="padding" value="15" />
         <option name="titlebarBold" value="1" />
         <option name="titlePadding" value="25" />
+        <option name="textOffsetY" value="21" /> 
 
         <!-- Top Row -->
         <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
diff --git a/data/themes/jewelry-simple/spells.xml b/data/themes/jewelry-simple/spells.xml
index faed923eb..8d37d727c 100644
--- a/data/themes/jewelry-simple/spells.xml
+++ b/data/themes/jewelry-simple/spells.xml
@@ -6,6 +6,7 @@
         <option name="padding" value="15" />
         <option name="titlebarBold" value="1" />
         <option name="titlePadding" value="25" />
+        <option name="textOffsetY" value="21" /> 
 
         <!-- Top Row -->
         <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
diff --git a/data/themes/jewelry/spells.xml b/data/themes/jewelry/spells.xml
index faed923eb..8d37d727c 100644
--- a/data/themes/jewelry/spells.xml
+++ b/data/themes/jewelry/spells.xml
@@ -6,6 +6,7 @@
         <option name="padding" value="15" />
         <option name="titlebarBold" value="1" />
         <option name="titlePadding" value="25" />
+        <option name="textOffsetY" value="21" /> 
 
         <!-- Top Row -->
         <part type="top-left-corner" xpos="0" ypos="0" width="30" height="53" />
diff --git a/data/themes/pink/spells.xml b/data/themes/pink/spells.xml
index dbfa79ad0..ef140763e 100644
--- a/data/themes/pink/spells.xml
+++ b/data/themes/pink/spells.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="250" ypos="0">
+        <option name="textOffsetY" value="21" /> 
+
         <!-- Top Row -->
         <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
         <part type="top-edge" xpos="0" ypos="10" width="10" height="10" />
diff --git a/data/themes/unity/spells.xml b/data/themes/unity/spells.xml
index e59c22879..2e695e11a 100644
--- a/data/themes/unity/spells.xml
+++ b/data/themes/unity/spells.xml
@@ -2,6 +2,8 @@
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="padding" value="10" />
+        <option name="textOffsetY" value="21" /> 
+
         <!-- Top Row -->
         <part type="top-left-corner" xpos="0" ypos="0" width="10" height="10" />
         <part type="top-edge" xpos="11" ypos="0" width="127" height="10" />
diff --git a/src/gui/widgets/spellshortcutcontainer.cpp b/src/gui/widgets/spellshortcutcontainer.cpp
index b2a80209e..5bc40f7bd 100644
--- a/src/gui/widgets/spellshortcutcontainer.cpp
+++ b/src/gui/widgets/spellshortcutcontainer.cpp
@@ -120,7 +120,7 @@ void SpellShortcutContainer::draw(Graphics *const graphics)
                 mForegroundColor2,
                 spell->getSymbol(),
                 itemX + mTextOffsetX,
-                itemY + mBoxHeight / 2);
+                itemY + mTextOffsetY);
         }
     }
 
@@ -183,7 +183,7 @@ void SpellShortcutContainer::safeDraw(Graphics *const graphics)
                 mForegroundColor2,
                 spell->getSymbol(),
                 itemX + mTextOffsetX,
-                itemY + mBoxHeight / 2);
+                itemY + mTextOffsetY);
         }
     }
 
-- 
cgit v1.2.3-70-g09d2