list: fixes

This commit is contained in:
2014-01-30 17:24:23 +04:00
parent c46a0a4b76
commit b2f4cbcee2
6 changed files with 25 additions and 10 deletions

View File

@@ -7,7 +7,9 @@ interface ITextView<C:Content, T> extends IView<C> {
public var textField(default, null):T;
public var text(get, set):String;
public var align(default, set):TextFormatAlign;
//ToDo: font properties to object
public var fontFamily(default, set):String;
public var fontEmbed(default, set):Bool;
public var fontColor(default, set):Int;
public var fontSize(default, set):Float;
}

View File

@@ -16,6 +16,7 @@ class TextView extends SpriteView implements ITextView<Sprite, TextField> {
private var _text:String;
public var align(default, set):TextFormatAlign;
public var fontFamily(default, set):String;
public var fontEmbed(default, set):Bool;
public var fontColor(default, set):Int;
public var fontSize(default, set):Float;
@@ -101,6 +102,14 @@ class TextView extends SpriteView implements ITextView<Sprite, TextField> {
return fontFamily;
}
private function set_fontEmbed(value:Bool):Bool {
if (fontEmbed != value) {
fontEmbed = value;
invalidate();
}
return fontEmbed;
}
private function set_fontColor(value:Int):Int {
if (fontColor != value) {
fontColor = value;
@@ -124,6 +133,7 @@ class TextView extends SpriteView implements ITextView<Sprite, TextField> {
}
override public function update():Void {
textField.embedFonts = fontEmbed;
textField.defaultTextFormat = textFormat;
textField.autoSize = fill ? TextFieldAutoSize.NONE : TextFieldAutoSize.LEFT;
var t:String = currentText();

View File

@@ -19,7 +19,7 @@ class HListView<V:View<Dynamic>, D> extends ListView<V, D> {
var view:IView<Dynamic> = item.view;
itemSize = view.width + view.leftMargin + view.rightMargin + container.layoutMargin;
size = Math.ceil(Math.max(0, width / itemSize)) + 2;
sizeDiff = size - (width / itemSize);
sizeDiff = size - ((width - container.layoutMargin - 1) / itemSize);
}
override private function set_offsetDiff(value:Float):Float {

View File

@@ -19,7 +19,7 @@ class VListView<V:View<Dynamic>, D> extends ListView<V, D> {
var view:IView<Dynamic> = item.view;
itemSize = view.height + view.topMargin + view.bottomMargin + container.layoutMargin;
size = Math.ceil(Math.max(0, height / itemSize)) + 2;
sizeDiff = size - (height / itemSize);
sizeDiff = size - ((height - container.layoutMargin - 1) / itemSize);
}
override private function set_offsetDiff(value:Float):Float {

View File

@@ -2,7 +2,16 @@ package haxework.net.order;
import haxework.net.callback.ICallback;
typedef Order<T> = {
var id:String;
var data:Null<T>;
var callbacks:Array<ICallback<T>>;
var clients:Int;
}
interface IOrderSupplier {
public var orders(default, null):Map<String, Order<Dynamic>>;
public function request<T>(url:String, clazz:Class<T>):ICallback<T>;
public function release(url:String):Void;
}

View File

@@ -1,5 +1,6 @@
package haxework.net.order;
import haxework.net.order.IOrderSupplier.Order;
import haxework.storage.IStorage;
import haxework.provider.Provider;
import haxework.net.callback.Callback;
@@ -7,18 +8,11 @@ import com.abit.umix.prepare.AutoCallback;
import flash.display.BitmapData;
import haxework.net.callback.ICallback;
typedef Order<T> = {
var id:String;
var data:Null<T>;
var callbacks:Array<ICallback<T>>;
var clients:Int;
}
class OrderSupplier implements IOrderSupplier {
private static inline var TAG:String = "OrderSupplier";
private var orders:Map<String, Order<Dynamic>>;
public var orders(default, null):Map<String, Order<Dynamic>>;
public function new() {
orders = new Map<String, Order<Dynamic>>();