浏览代码

Bugfixes.

Lasse Öörni 15 年之前
父节点
当前提交
7930515a57
共有 3 个文件被更改,包括 5 次插入4 次删除
  1. 1 1
      Bin/Data/Scripts/GraphicsTest.as
  2. 1 1
      Bin/Data/Scripts/NinjaSnowWar.as
  3. 3 2
      Engine/UI/UIElement.cpp

+ 1 - 1
Bin/Data/Scripts/GraphicsTest.as

@@ -309,7 +309,7 @@ void initConsole()
     BorderImage@ cursor = console.getLineEdit().getCursor();
     cursor.setWidth(4);
     cursor.setTexture(cache.getResource("Texture2D", "Textures/UI.png"));
-    cursor.setImageRect(112, 0, 116, 16);
+    cursor.setImageRect(12, 0, 16, 16);
 
     engine.createDebugHud();
     debugHud.setFont(cache.getResource("Font", "cour.ttf"), 12);

+ 1 - 1
Bin/Data/Scripts/NinjaSnowWar.as

@@ -86,7 +86,7 @@ void initConsole()
     BorderImage@ cursor = console.getLineEdit().getCursor();
     cursor.setWidth(4);
     cursor.setTexture(cache.getResource("Texture2D", "Textures/UI.png"));
-    cursor.setImageRect(112, 0, 116, 16);
+    cursor.setImageRect(12, 0, 16, 16);
 
     engine.createDebugHud();
     debugHud.setFont(cache.getResource("Font", "cour.ttf"), 12);

+ 3 - 2
Engine/UI/UIElement.cpp

@@ -1154,7 +1154,7 @@ IntVector2 UIElement::getLayoutChildPosition(UIElement* child)
         ret.mX = mLayoutBorder.mLeft;
         
     case HA_RIGHT:
-        ret.mX -mLayoutBorder.mRight;
+        ret.mX = -mLayoutBorder.mRight;
     }
     
     VerticalAlignment va = child->getVerticalAlignment();
@@ -1164,8 +1164,9 @@ IntVector2 UIElement::getLayoutChildPosition(UIElement* child)
         ret.mY = mLayoutBorder.mTop;
         
     case VA_BOTTOM:
-        ret.mY = mLayoutBorder.mBottom;
+        ret.mY = -mLayoutBorder.mBottom;
     }
+    
     return ret;
 }