From c35446a03137cf8b21037b966addf836b09f9c58 Mon Sep 17 00:00:00 2001
From: shmyga <shmyga.z@gmail.com>
Date: Tue, 7 Jan 2014 16:21:07 +0400
Subject: [PATCH] fixes

---
 haxework/gui/layout/HorizontalLayout.hx |  4 ++--
 haxework/gui/layout/VerticalLayout.hx   |  4 ++--
 haxework/net/BaseURLLoader.hx           | 14 +++++++++++++-
 haxework/resources/Resources.hx         |  2 +-
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/haxework/gui/layout/HorizontalLayout.hx b/haxework/gui/layout/HorizontalLayout.hx
index 26f25d1..d7931d1 100755
--- a/haxework/gui/layout/HorizontalLayout.hx
+++ b/haxework/gui/layout/HorizontalLayout.hx
@@ -28,8 +28,8 @@ class HorizontalLayout extends DefaultLayout {
     }
 
     if (group.contentSize) {
-      group.width = fixedSize;
-      group.height = maxHeight;
+      group.width = fixedSize + group.leftPadding + group.rightPadding;
+      group.height = maxHeight + group.topPadding + group.bottomPadding;
     }
 
     leftSize -= fixedSize;
diff --git a/haxework/gui/layout/VerticalLayout.hx b/haxework/gui/layout/VerticalLayout.hx
index e096c5f..c654aac 100755
--- a/haxework/gui/layout/VerticalLayout.hx
+++ b/haxework/gui/layout/VerticalLayout.hx
@@ -27,8 +27,8 @@ class VerticalLayout extends DefaultLayout {
     }
 
     if (group.contentSize) {
-      group.width = maxWidth;
-      group.height = fixedSize;
+      group.width = maxWidth + group.leftPadding + group.rightPadding;
+      group.height = fixedSize + group.topPadding + group.bottomPadding;
     }
 
     leftSize -= fixedSize;
diff --git a/haxework/net/BaseURLLoader.hx b/haxework/net/BaseURLLoader.hx
index abe930e..a39282e 100755
--- a/haxework/net/BaseURLLoader.hx
+++ b/haxework/net/BaseURLLoader.hx
@@ -65,9 +65,21 @@ class BaseURLLoader<T> extends BaseLoader<T> {
 
   override private function onError(e:Event):Void {
     var c:ICallback<T> = callback;
-    var error:String = loader.data ? Std.string(loader.data) : null;
+    var error:String = extrudeError(loader.data);
     dispose();
     c.callFail(error != null ? error : e);
   }
+
+  private function extrudeError(data:Dynamic):String {
+    return if (data == null) null else {
+      var s:String = Std.string(data);
+      var r:EReg = ~/<h1>(.*?)<\/h1>/;
+      if (r.match(s)) {
+        r.matched(1);
+      } else {
+        s;
+      }
+    }
+  }
 }
 
diff --git a/haxework/resources/Resources.hx b/haxework/resources/Resources.hx
index 661ed97..480a28f 100755
--- a/haxework/resources/Resources.hx
+++ b/haxework/resources/Resources.hx
@@ -5,7 +5,7 @@ import haxework.core.Tuple;
 import haxe.ds.StringMap;
 import flash.display.BitmapData;
 
-typedef F = Tuple2<Dynamic, String>
+private typedef F = Tuple2<Dynamic, String>
 
 class ResMap<T> extends StringMap<T> {