From a285bd7b3d888285095a295ab9e393560a69f30b Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Wed, 23 May 2018 02:05:18 +0300
Subject: Use skin option textOffsetY in item shortcut container.

---
 data/graphics/gui/items.xml               | 2 ++
 data/themes/enchilado/items.xml           | 2 ++
 data/themes/golden-delicious/items.xml    | 1 +
 data/themes/jewelry-simple/items.xml      | 1 +
 data/themes/jewelry/items.xml             | 1 +
 data/themes/pink/items.xml                | 2 ++
 data/themes/unity/items.xml               | 2 ++
 data/themes/wood/items.xml                | 1 +
 src/gui/widgets/itemshortcutcontainer.cpp | 8 ++++----
 9 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/data/graphics/gui/items.xml b/data/graphics/gui/items.xml
index 4ad70a5a8..502e7fcdf 100644
--- a/data/graphics/gui/items.xml
+++ b/data/graphics/gui/items.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/items.xml b/data/themes/enchilado/items.xml
index c4e12e15c..389764ca1 100644
--- a/data/themes/enchilado/items.xml
+++ b/data/themes/enchilado/items.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/items.xml b/data/themes/golden-delicious/items.xml
index 7cc5c2e3b..15142ad37 100644
--- a/data/themes/golden-delicious/items.xml
+++ b/data/themes/golden-delicious/items.xml
@@ -6,6 +6,7 @@
         <option name="padding" value="8" />
         <option name="titlebarBold" value="1" />
         <option name="titlePadding" value="20" />
+        <option name="textOffsetY" value="21" /> 
 
         <!-- Top Row -->
         <part type="top-left-corner" xpos="0" ypos="0" width="20" height="53" />
diff --git a/data/themes/jewelry-simple/items.xml b/data/themes/jewelry-simple/items.xml
index faed923eb..8d37d727c 100644
--- a/data/themes/jewelry-simple/items.xml
+++ b/data/themes/jewelry-simple/items.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/items.xml b/data/themes/jewelry/items.xml
index faed923eb..8d37d727c 100644
--- a/data/themes/jewelry/items.xml
+++ b/data/themes/jewelry/items.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/items.xml b/data/themes/pink/items.xml
index dbfa79ad0..ef140763e 100644
--- a/data/themes/pink/items.xml
+++ b/data/themes/pink/items.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/items.xml b/data/themes/unity/items.xml
index e59c22879..2e695e11a 100644
--- a/data/themes/unity/items.xml
+++ b/data/themes/unity/items.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/data/themes/wood/items.xml b/data/themes/wood/items.xml
index 38b016fca..461c86c2d 100644
--- a/data/themes/wood/items.xml
+++ b/data/themes/wood/items.xml
@@ -2,6 +2,7 @@
 <skinset name="Default" image="window.png">
     <widget type="Window" xpos="260" ypos="0">
         <option name="padding" value="6" />
+        <option name="textOffsetY" value="21" /> 
 
         <!-- Top Row -->
         <part type="top-left-corner" width="10" height="10" />
diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 50155fa92..dcafa2233 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -206,7 +206,7 @@ void ItemShortcutContainer::draw(Graphics *const graphics)
                     mForegroundColor,
                     spell->getSymbol(),
                     itemX + mTextOffsetX,
-                    itemY + mBoxHeight / 2);
+                    itemY + mTextOffsetY);
             }
         }
         else if (skillDialog != nullptr)
@@ -231,7 +231,7 @@ void ItemShortcutContainer::draw(Graphics *const graphics)
                         mForegroundColor,
                         skill->data->shortName,
                         itemX + mTextOffsetX,
-                        itemY + mBoxHeight / 2);
+                        itemY + mTextOffsetY);
                 }
             }
         }
@@ -353,7 +353,7 @@ void ItemShortcutContainer::safeDraw(Graphics *const graphics)
                     mForegroundColor,
                     spell->getSymbol(),
                     itemX + mTextOffsetX,
-                    itemY + mBoxHeight / 2);
+                    itemY + mTextOffsetY);
             }
         }
         else if (skillDialog != nullptr)
@@ -378,7 +378,7 @@ void ItemShortcutContainer::safeDraw(Graphics *const graphics)
                         mForegroundColor,
                         skill->data->shortName,
                         itemX + mTextOffsetX,
-                        itemY + mBoxHeight / 2);
+                        itemY + mTextOffsetY);
                 }
             }
         }
-- 
cgit v1.2.3-60-g2f50