From 0f980ec18b5b7fba96447c60ec5017c9cd40e453 Mon Sep 17 00:00:00 2001
From: Henrique Santiago <henrique_santiago93@hotmail.com>
Date: Sun, 5 Aug 2012 18:43:45 -0300
Subject: [PATCH] Internal change to entergame, fix image-offset-y mistake,
 change the way default font is set in skins.

---
 modules/client_entergame/entergame.otui | 15 ++++++++-------
 modules/client_skins/skins.lua          |  8 ++++----
 modules/client_skins/skins/default.lua  |  1 +
 src/framework/ui/uiwidget.h             |  2 +-
 4 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/modules/client_entergame/entergame.otui b/modules/client_entergame/entergame.otui
index 885cd7f7..c29335ac 100644
--- a/modules/client_entergame/entergame.otui
+++ b/modules/client_entergame/entergame.otui
@@ -53,33 +53,34 @@ MainWindow
     !text: tr('Protocol')
     anchors.left: parent.left
     anchors.top: serverHostTextEdit.bottom
-    anchors.right: portLabel.left
+    text-auto-resize: true
     margin-right: 10
     margin-top: 8
 
   ComboBox
     id: protocolComboBox
     anchors.left: protocolLabel.left
-    anchors.right: protocolLabel.right
+    anchors.right: parent.horizontalCenter
     anchors.top: protocolLabel.bottom
     margin-top: 2
+    margin-right: 3
     width: 90
 
   MenuLabel
     id: portLabel
     !text: tr('Port')
-    anchors.right: parent.right
+    anchors.left: serverPortTextEdit.left
     anchors.top: serverHostTextEdit.bottom
     margin-top: 8
-    width: 70
+    text-auto-resize: true
 
   TextEdit
     id: serverPortTextEdit
     text: 7171
     anchors.right: parent.right
-    anchors.left: portLabel.left
-    anchors.top: portLabel.bottom
-    margin-top: 2
+    anchors.left: parent.horizontalCenter
+    anchors.top: protocolComboBox.top
+    margin-left: 3
 
   CheckBox
     id: rememberPasswordBox
diff --git a/modules/client_skins/skins.lua b/modules/client_skins/skins.lua
index a911582e..5c3565ba 100644
--- a/modules/client_skins/skins.lua
+++ b/modules/client_skins/skins.lua
@@ -117,13 +117,13 @@ function Skins.loadSkin(skin)
   if skin.fonts then
     for i=1,#skin.fonts do
       g_fonts.importFont('skins/' .. lowerName .. '/fonts/' .. skin.fonts[i])
-
-      if i == 1 then
-        g_fonts.setDefaultFont(skin.fonts[i])
-      end
     end
   end
 
+  if skin.defaultFont then
+    g_fonts.setDefaultFont(skin.defaultFont)
+  end
+
   if skin.styles then
     for i=1,#skin.styles do
       g_ui.importStyle('skins/' .. lowerName .. '/styles/' .. skin.styles[i])
diff --git a/modules/client_skins/skins/default.lua b/modules/client_skins/skins/default.lua
index 29eeb69c..76a3380b 100644
--- a/modules/client_skins/skins/default.lua
+++ b/modules/client_skins/skins/default.lua
@@ -8,6 +8,7 @@ local skin = {
     'verdana-11px-rounded',
     'terminus-14px-bold'
   },
+  defaultFont = 'verdana-11px-antialised',
 
   styles = {
     'buttons.otui',
diff --git a/src/framework/ui/uiwidget.h b/src/framework/ui/uiwidget.h
index 4af6605d..12d3e0ea 100644
--- a/src/framework/ui/uiwidget.h
+++ b/src/framework/ui/uiwidget.h
@@ -413,7 +413,7 @@ public:
     void setImageSource(const std::string& source);
     void setImageClip(const Rect& clipRect) { m_imageClipRect = clipRect; updateImageCache(); }
     void setImageOffsetX(int x) { m_imageRect.setX(x); updateImageCache(); }
-    void setImageOffsetY(int y) { m_imageRect.setX(y); updateImageCache(); }
+    void setImageOffsetY(int y) { m_imageRect.setY(y); updateImageCache(); }
     void setImageOffset(const Point& pos) { m_imageRect.move(pos); updateImageCache(); }
     void setImageWidth(int width) { m_imageRect.setWidth(width); updateImageCache(); }
     void setImageHeight(int height) { m_imageRect.setHeight(height); updateImageCache(); }