diff --git a/bin/Falcon.swc b/bin/Falcon.swc index 90b1703..6c3a599 100644 Binary files a/bin/Falcon.swc and b/bin/Falcon.swc differ diff --git a/src/com/hendrix/feathers/controls/core/sql/sqlSerialData/SQLSerialDataTable.as b/src/com/hendrix/feathers/controls/core/sql/sqlSerialData/SQLSerialDataTable.as index 1e28e44..2c45258 100644 --- a/src/com/hendrix/feathers/controls/core/sql/sqlSerialData/SQLSerialDataTable.as +++ b/src/com/hendrix/feathers/controls/core/sql/sqlSerialData/SQLSerialDataTable.as @@ -17,10 +17,10 @@ package com.hendrix.feathers.controls.core.sql.sqlSerialData private var _TABLE_NAME: String; // Contacts Table Columns names - private static const KEY_ID: String = "id"; - private static const KEY_DATA: String = "data"; + protected static const KEY_ID: String = "id"; + protected static const KEY_DATA: String = "data"; - private var _connection: SQLConnection = null; + protected var _connection: SQLConnection = null; private var _dbName: String = null; private var _dbPath: File = null; diff --git a/src/com/hendrix/feathers/controls/core/sql/sqlSerialData/SQLUtils.as b/src/com/hendrix/feathers/controls/core/sql/sqlSerialData/SQLUtils.as index 52df98e..e409bad 100644 --- a/src/com/hendrix/feathers/controls/core/sql/sqlSerialData/SQLUtils.as +++ b/src/com/hendrix/feathers/controls/core/sql/sqlSerialData/SQLUtils.as @@ -24,7 +24,6 @@ package com.hendrix.feathers.controls.core.sql.sqlSerialData arr[ix].data = Serialize.stringToObject(arr[ix].data); } - return arr; } } diff --git a/src/com/hendrix/feathers/controls/flex/FlexImage.as b/src/com/hendrix/feathers/controls/flex/FlexImage.as index da6c9a2..7ccbdef 100644 --- a/src/com/hendrix/feathers/controls/flex/FlexImage.as +++ b/src/com/hendrix/feathers/controls/flex/FlexImage.as @@ -16,10 +16,15 @@ package com.hendrix.feathers.controls.flex * * + * + * + *

+ * TODO: + *

  • add alignment tools with horizontalAlign/verticalAlign * * @author Tomer Shalev */ @@ -48,16 +53,6 @@ package com.hendrix.feathers.controls.flex private var _color: int = -1; - /** - *

    a Flex comp Image container

    - * - *

    - * @author Tomer Shalev - */ public function FlexImage() { super(); @@ -240,7 +235,7 @@ package com.hendrix.feathers.controls.flex ar = Math.min(arW, arH); if(ar == 0) ar = Math.max(arW, arH); - imgW = _img.texture.width * ar; + imgW = _img.texture.width * ar; imgH = _img.texture.height * ar; break; } @@ -293,6 +288,9 @@ package com.hendrix.feathers.controls.flex _img.width = imgW; _img.height = imgH; + _img.x =(width - _img.width) * 0.5; + _img.y =(height - _img.height) * 0.5; + if(width == 0) width = imgW; diff --git a/src/com/hendrix/feathers/controls/flex/HGroup.as b/src/com/hendrix/feathers/controls/flex/HGroup.as index e616d22..5de5282 100644 --- a/src/com/hendrix/feathers/controls/flex/HGroup.as +++ b/src/com/hendrix/feathers/controls/flex/HGroup.as @@ -361,7 +361,7 @@ package com.hendrix.feathers.controls.flex // if width was not set, then we give the width that the children occupy if(width == 0) { explicitWidth = NaN; - var c: Number = isNaN(percentHeight) ? 0 : percentWidth*relativeCalcWidthParent.width; + var c: Number = isNaN(percentWidth) ? 0 : percentWidth*relativeCalcWidthParent.width; var a: Boolean = setSizeInternal(Math.max(posx, c), height, false); } diff --git a/src/com/hendrix/feathers/controls/utils/serialize/Serialize.as b/src/com/hendrix/feathers/controls/utils/serialize/Serialize.as index 16da648..cf25941 100644 --- a/src/com/hendrix/feathers/controls/utils/serialize/Serialize.as +++ b/src/com/hendrix/feathers/controls/utils/serialize/Serialize.as @@ -18,15 +18,22 @@ package com.hendrix.feathers.controls.utils.serialize return Base64.encodeByteArray(ba); } - static public function objectToString(obj:Object):String - { - _byteArray.position = 0; - _byteArray.length = 0; - _byteArray.writeObject(obj); - - return Base64.encodeByteArray(_byteArray); - } - + static public function objectToString(obj:Object):String + { + return Base64.encodeByteArray(objectToByteArray(obj)); + } + + static public function objectToByteArray(obj:Object, $ba: ByteArray = null):ByteArray + { + var ba: ByteArray = $ba ? $ba : new ByteArray(); + + ba.position = 0; + + ba.writeObject(obj); + + return ba; + } + static public function stringToObject(data:String):Object { var ba: ByteArray = Base64.decodeToByteArray(data);