InfernalGames/haxework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[gui] update

Browse Source
This commit is contained in:
shmyga
2019-03-01 12:48:07 +03:00
parent 020fb23188
commit 3e06e5df26
22 changed files with 273 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/haxework/gui/ImageView.hx
View File

@@ -21,8 +21,10 @@ class ImageView extends SpriteView {
if (image != value) {
image = value;
skin = [new BitmapSkin(image, FillType.DEFAULT)];
toUpdate();
toRedraw();
//geometry.size.content.width = value.width;
//geometry.size.content.height = value.height;
//toUpdate();
//toRedraw();
}
return image;
}

3
src/main/haxework/gui/ScrollView.hx
View File

@@ -1,5 +1,6 @@
package haxework.gui;
import haxework.gui.core.Geometry.Position;
import flash.display.DisplayObject;
import flash.display.Sprite;
import flash.events.MouseEvent;
@@ -44,7 +45,7 @@ class ScrollView extends HGroupView {
if (scroll.ratio == ratio) return;
scroll.ratio = ratio;
scroll.visible = ratio < 1;
scroll.geometry.skipLayout = ratio >= 1;
scroll.geometry.position = ratio < 1 ? LAYOUT : ABSOLUTE;
});
scroll.onScroll.connect(function(position) this.position = position);
return scroll;

16
src/main/haxework/gui/SpriteView.hx
View File

@@ -11,15 +11,11 @@ class SpriteView extends View<Sprite> {
override public function redraw():Void {
this.content.graphics.clear();
super.redraw();
#if dev_layout
var graphics = content.graphics;
graphics.lineStyle(1, 0x00ff00);
graphics.drawRect(0, 0, width, height);
graphics.lineStyle();
#end
}
#if dev_layout
override public function update():Void {
super.update();
var g:Graphics = content.graphics;
g.lineStyle(1, 0x00ff00);
g.drawRect(0, 0, width, height);
g.lineStyle();
}
#end
}

16
src/main/haxework/gui/TextView.hx
View File

@@ -1,11 +1,11 @@
package haxework.gui;
import haxework.gui.core.VAlign;
import haxework.gui.core.HAlign;
import flash.text.TextField;
import flash.text.TextFieldAutoSize;
import flash.text.TextFormat;
import flash.text.TextFormatAlign;
import haxework.gui.core.HAlign;
import haxework.gui.core.VAlign;
import haxework.text.BitmapTextField;
import haxework.text.TextUtil;
@@ -172,15 +172,15 @@ class TextView extends SpriteView implements ITextView {
textField.height = geometry.size.content.height;
textField.x = switch (layout.hAlign) {
case HAlign.LEFT | HAlign.NONE: geometry.padding.left;
case HAlign.CENTER: (width - textField.width) / 2 + geometry.padding.left - geometry.padding.right;
case HAlign.RIGHT: width - textField.width - geometry.padding.right;
case LEFT | NONE: geometry.padding.left;
case CENTER: (width - textField.width) / 2 + geometry.padding.left - geometry.padding.right;
case RIGHT: width - textField.width - geometry.padding.right;
default: 0;
}
textField.y = switch (layout.vAlign) {
case VAlign.TOP | VAlign.NONE: geometry.padding.top;
case VAlign.MIDDLE: (height - geometry.size.content.height) / 2 + geometry.padding.top - geometry.padding.bottom;
case VAlign.BOTTOM: height - geometry.size.content.height - geometry.padding.bottom;
case TOP | NONE: geometry.padding.top;
case MIDDLE: (height - geometry.size.content.height) / 2 + geometry.padding.top - geometry.padding.bottom;
case BOTTOM: height - geometry.size.content.height - geometry.padding.bottom;
default: 0;
}
}

55
src/main/haxework/gui/View.hx
View File

@@ -1,16 +1,15 @@
package haxework.gui;
import haxework.gui.skin.ISkin.ISizeSkin;
import flash.display.DisplayObject;
import flash.display.InteractiveObject;
import flash.display.Stage;
import flash.events.Event;
import haxework.gui.core.Geometry;
import haxework.gui.skin.ISkin.SkinSet;
class View<C:DisplayObject> implements IView<C> {
private static var counter:Int = 0;
public static var updater(default, null):Updater = new Updater();
public static var updater(default, null):ViewUpdater = new ViewUpdater();
public var id(default, default):String;
@@ -61,6 +60,13 @@ class View<C:DisplayObject> implements IView<C> {
public function redraw():Void {
for (skin in this.skin) {
if (Std.is(skin, ISizeSkin)) {
var sizeSkin:ISizeSkin = cast skin;
if (sizeSkin.width != geometry.size.content.width || sizeSkin.height != geometry.size.content.width) {
geometry.size.content = [sizeSkin.width, sizeSkin.height];
toUpdateParent();
}
}
skin.draw(this);
}
}
@@ -131,46 +137,3 @@ class View<C:DisplayObject> implements IView<C> {
return mouseEnabled;
}
}
class Updater {
public var stage(null, set):Stage;
private var updateViews:Array<IView<Dynamic>>;
private var redrawViews:Array<IView<Dynamic>>;
public function new() {
updateViews = [];
redrawViews = [];
}
private function set_stage(value:Stage):Stage {
value.addEventListener(Event.ENTER_FRAME, update);
value.addEventListener(Event.ENTER_FRAME, redraw);
return value;
}
public function toUpdate(view:IView<Dynamic>):Void {
if (updateViews.indexOf(view) == -1) updateViews.push(view);
}
public function toRedraw(view:IView<Dynamic>):Void {
if (redrawViews.indexOf(view) == -1) redrawViews.push(view);
}
public function update(?_):Void {
while (updateViews.length > 0) {
var v = null;
v = updateViews.shift();
v.update();
}
}
public function redraw(?_):Void {
while (redrawViews.length > 0) {
var v = null;
v = redrawViews.shift();
v.redraw();
}
}
}

53
src/main/haxework/gui/ViewUpdater.hx Normal file
View File

@@ -0,0 +1,53 @@
package haxework.gui;
import flash.events.Event;
import flash.display.Stage;
class ViewUpdater {
public var stage(null, set):Stage;
private var updateViews:Array<IView<Dynamic>>;
private var redrawViews:Array<IView<Dynamic>>;
public function new() {
updateViews = [];
redrawViews = [];
}
private function set_stage(value:Stage):Stage {
value.addEventListener(Event.ENTER_FRAME, onEnterFrame);
return value;
}
public function toUpdate(view:IView<Dynamic>):Void {
if (updateViews.indexOf(view) == -1) updateViews.push(view);
}
public function toRedraw(view:IView<Dynamic>):Void {
if (redrawViews.indexOf(view) == -1) redrawViews.push(view);
}
private function onEnterFrame(_):Void {
update();
redraw();
if (updateViews.length > 0) {
update();
redraw();
}
}
public function update():Void {
while (updateViews.length > 0) {
var v = null;
v = updateViews.shift();
v.update();
}
}
public function redraw():Void {
while (redrawViews.length > 0) {
var v = null;
v = redrawViews.shift();
v.redraw();
}
}
}

68
src/main/haxework/gui/core/Box.hx Normal file
View File

@@ -0,0 +1,68 @@
package haxework.gui.core;
abstract Box(Array<Float>) {
public var left(get, set):Float;
public var right(get, set):Float;
public var top(get, set):Float;
public var bottom(get, set):Float;
public var vertical(get, never):Float;
public var horizontal(get, never):Float;
inline public function new(value:Array<Float>) {
this = switch(value) {
case []: [0, 0, 0, 0];
case [a]: [a, a, a, a];
case [a, b]: [a, a, b, b];
case [a, b, c, d]: [a, b, c, b];
case x: x;
}
}
inline private function get_left():Float {
return this[0];
}
inline private function set_left(value:Float):Float {
return this[0] = value;
}
inline private function get_right():Float {
return this[1];
}
inline private function set_right(value:Float):Float {
return this[1] = value;
}
inline private function get_top():Float {
return this[2];
}
inline private function set_top(value:Float):Float {
return this[2] = value;
}
inline private function get_bottom():Float {
return this[3];
}
inline private function set_bottom(value:Float):Float {
return this[3] = value;
}
inline private function get_vertical():Float {
return top + bottom;
}
inline private function get_horizontal():Float {
return left + right;
}
@:from static public inline function fromArray(value:Array<Float>):Box {
return new Box(value);
}
@:from static public inline function fromFloat(value:Float):Box {
return new Box([value]);
}
}

6
src/main/haxework/gui/core/Direction.hx
View File

@@ -1,6 +0,0 @@
package haxework.gui.core;
enum Direction {
HORIZONTAL;
VERTICAL;
}

125
src/main/haxework/gui/core/Geometry.hx
View File

@@ -1,59 +1,20 @@
package haxework.gui.core;
abstract Size(Array<Float>) {
public var width(get, set):Float;
public var height(get, set):Float;
inline public function new(value:Array<Float>) {
this = switch(value) {
case []: [-1, -1];
case [a]: [a, a];
case [a, b]: [a, b];
case x: x;
}
}
inline private function get_width():Float {
return this[0];
}
inline private function set_width(value:Float):Float {
return this[0] = value;
}
inline private function get_height():Float {
return this[1];
}
inline private function set_height(value:Float):Float {
return this[1] = value;
}
@:from static public inline function fromArray(value:Array<Float>):Size {
return new Size(value);
}
@:from static public inline function fromFloat(value:Float):Size {
return new Size([value]);
}
}
enum SizeValue {
FIXED(value:Float);
PERCENT(value:Float);
}
class SizeSet {
public var min(default, default):Size;
public var max(default, default):Size;
public var content(default, default):Size;
public var fixed(default, default):Size;
public var percent(default, default):Size;
public var stretch(null, set):Bool;
public var width(null, set):Dynamic;
public var height(null, set):Dynamic;
public function new() {
this.min = [];
this.max = [];
this.content = [];
this.fixed = [];
this.percent = [];
@@ -63,73 +24,27 @@ class SizeSet {
this.percent = value ? [100] : [];
return value;
}
}
abstract Box(Array<Float>) {
public var left(get, set):Float;
public var right(get, set):Float;
public var top(get, set):Float;
public var bottom(get, set):Float;
public var vertical(get, never):Float;
public var horizontal(get, never):Float;
inline public function new(value:Array<Float>) {
this = switch(value) {
case []: [0, 0, 0, 0];
case [a]: [a, a, a, a];
case [a, b]: [a, a, b, b];
case [a, b, c, d]: [a, b, c, b];
case x: x;
inline private function set_width(value:Dynamic):Dynamic {
if (Std.is(value, Float)) {
return fixed.width = value;
} else {
return percent.width = Std.parseFloat(value);
}
}
inline private function get_left():Float {
return this[0];
inline private function set_height(value:Dynamic):Dynamic {
if (Std.is(value, Float)) {
return fixed.height = value;
} else {
return percent.height = Std.parseFloat(value);
}
}
}
inline private function set_left(value:Float):Float {
return this[0] = value;
}
inline private function get_right():Float {
return this[1];
}
inline private function set_right(value:Float):Float {
return this[1] = value;
}
inline private function get_top():Float {
return this[2];
}
inline private function set_top(value:Float):Float {
return this[2] = value;
}
inline private function get_bottom():Float {
return this[3];
}
inline private function set_bottom(value:Float):Float {
return this[3] = value;
}
inline private function get_vertical():Float {
return top + bottom;
}
inline private function get_horizontal():Float {
return left + right;
}
@:from static public inline function fromArray(value:Array<Float>):Box {
return new Box(value);
}
@:from static public inline function fromFloat(value:Float):Box {
return new Box([value]);
}
@:enum abstract Position(String) from String to String {
var LAYOUT = "layout";
var ABSOLUTE = "absolute";
}
class Geometry {
@@ -138,7 +53,7 @@ class Geometry {
public var size(default, default):SizeSet;
public var hAlign(default, default):HAlign;
public var vAlign(default, default):VAlign;
public var skipLayout(default, default):Bool;
public var position(default, default):Position;
public var width(get, never):SizeValue;
public var height(get, never):SizeValue;
@@ -149,7 +64,7 @@ class Geometry {
this.size = new SizeSet();
this.hAlign = HAlign.NONE;
this.vAlign = VAlign.NONE;
this.skipLayout = false;
this.position = Position.LAYOUT;
}
public function get_width():SizeValue {

8
src/main/haxework/gui/core/HAlign.hx
View File

@@ -1,8 +1,8 @@
package haxework.gui.core;
@:enum abstract HAlign(String) from String to String {
var NONE = "NONE";
var LEFT = "LEFT";
var CENTER = "CENTER";
var RIGHT = "RIGHT";
var NONE = "none";
var LEFT = "left";
var CENTER = "center";
var RIGHT = "right";
}

39
src/main/haxework/gui/core/Size.hx Normal file
View File

@@ -0,0 +1,39 @@
package haxework.gui.core;
abstract Size(Array<Float>) {
public var width(get, set):Float;
public var height(get, set):Float;
inline public function new(value:Array<Float>) {
this = switch(value) {
case []: [-1, -1];
case [a]: [a, a];
case [a, b]: [a, b];
case x: x;
}
}
inline private function get_width():Float {
return this[0];
}
inline private function set_width(value:Float):Float {
return this[0] = value;
}
inline private function get_height():Float {
return this[1];
}
inline private function set_height(value:Float):Float {
return this[1] = value;
}
@:from static public inline function fromArray(value:Array<Float>):Size {
return new Size(value);
}
@:from static public inline function fromFloat(value:Float):Size {
return new Size([value]);
}
}

8
src/main/haxework/gui/core/VAlign.hx
View File

@@ -1,8 +1,8 @@
package haxework.gui.core;
@:enum abstract VAlign(String) from String to String {
var NONE = "NONE";
var TOP = "TOP";
var MIDDLE = "MIDDLE";
var BOTTOM = "BOTTOM";
var NONE = "none";
var TOP = "top";
var MIDDLE = "middle";
var BOTTOM = "bottom";
}

18
src/main/haxework/gui/layout/DefaultLayout.hx
View File

@@ -1,5 +1,6 @@
package haxework.gui.layout;
import haxework.gui.core.Geometry.Position;
import haxework.gui.core.Geometry.SizeValue;
import haxework.gui.core.VAlign;
import haxework.gui.core.HAlign;
@@ -27,14 +28,15 @@ class DefaultLayout implements ILayout {
private function filterViews(group:IGroupView, views:Array<IView<Dynamic>>):Array<IView<Dynamic>> {
return Lambda.array(Lambda.filter(views, function(view:IView<Dynamic>):Bool {
return if (!view.geometry.skipLayout) {
true;
} else {
setViewWidth(group, view);
setViewHeight(group, view);
placeViewHorizontal(group, view);
placeViewVertical(group, view);
false;
return switch (view.geometry.position) {
case ABSOLUTE:
setViewWidth(group, view);
setViewHeight(group, view);
placeViewHorizontal(group, view);
placeViewVertical(group, view);
false;
case LAYOUT:
true;
}
}));
}

15
src/main/haxework/gui/list/ListView.hx
View File

@@ -1,12 +1,13 @@
package haxework.gui.list;
import haxework.gui.skin.Skin;
import haxework.signal.Signal;
import flash.events.MouseEvent;
import haxework.gui.core.Geometry.Position;
import haxework.gui.core.HAlign;
import haxework.gui.core.VAlign;
import haxework.gui.layout.ILayout;
import haxework.gui.skin.Skin;
import haxework.signal.Signal;
import haxework.utils.NumberUtil;
import flash.events.MouseEvent;
import haxework.gui.core.HAlign;
class ListView<D> extends GroupView {
@@ -41,8 +42,8 @@ class ListView<D> extends GroupView {
public function new(layout:ILayout, otherLayout:ILayout) {
super(otherLayout);
main = new GroupView(layout);
main.layout.hAlign = HAlign.CENTER;
main.layout.vAlign = VAlign.MIDDLE;
main.layout.hAlign = CENTER;
main.layout.vAlign = MIDDLE;
main.geometry.size.stretch = true;
addView(main);
box = new GroupView(layout);
@@ -50,7 +51,7 @@ class ListView<D> extends GroupView {
main.addView(box);
mask = new SpriteView();
mask.geometry.size.stretch = true;
mask.geometry.skipLayout = true;
mask.geometry.position = ABSOLUTE;
mask.skin.push(Skin.color(0xffffff));
box.content.mask = mask.content;
box.addView(mask);

6
src/main/haxework/gui/skin/BitmapSkin.hx
View File

@@ -2,10 +2,10 @@ package haxework.gui.skin;
import flash.display.BitmapData;
import flash.geom.Rectangle;
import haxework.gui.skin.ISkin.ISizeSkin;
import haxework.gui.utils.DrawUtil;
class BitmapSkin implements ISkin<SpriteView> {
class BitmapSkin implements ISkin<SpriteView> implements ISizeSkin {
public var width(default, null):Float;
public var height(default, null):Float;
@@ -33,7 +33,5 @@ class BitmapSkin implements ISkin<SpriteView> {
public function draw(view:SpriteView):Void {
if (image == null) return;
DrawUtil.draw(view.content.graphics, image, new Rectangle(0, 0, view.width, view.height), fillType, color);
view.geometry.size.content.width = image.width;
view.geometry.size.content.height = image.height;
}
}

6
src/main/haxework/gui/skin/ButtonBitmapSkin.hx
View File

@@ -3,10 +3,11 @@ package haxework.gui.skin;
import flash.display.BitmapData;
import flash.geom.Rectangle;
import haxework.gui.ButtonView.ButtonState;
import haxework.gui.skin.ISkin.ISizeSkin;
import haxework.gui.utils.BitmapUtil;
import haxework.gui.utils.DrawUtil;
class ButtonBitmapSkin implements ISkin<ButtonView> {
class ButtonBitmapSkin implements ISkin<ButtonView> implements ISizeSkin {
public var width(default, null):Float;
public var height(default, null):Float;
@@ -62,8 +63,5 @@ class ButtonBitmapSkin implements ISkin<ButtonView> {
if (images == null) return;
var image:BitmapData = view.disabled ? disableImage == null ? disable : disableImage : images.get(view.state);
DrawUtil.draw(view.content.graphics, image, new Rectangle(0, 0, view.width, view.height), fillType, color);
view.geometry.size.content.width = image.width;
view.geometry.size.content.height = image.height;
}
}

5
src/main/haxework/gui/skin/ISkin.hx
View File

@@ -4,4 +4,9 @@ interface ISkin<V:IView<Dynamic>> {
public function draw(view: V): Void;
}
interface ISizeSkin {
public var width(default, null):Float;
public var height(default, null):Float;
}
typedef SkinSet = Array<ISkin<Dynamic>>;

18
src/main/haxework/gui/skin/SizeSkin.hx Normal file
View File

@@ -0,0 +1,18 @@
package haxework.gui.skin;
class SizeSkin implements ISkin<IView<Dynamic>> {
public var width(default, null):Float;
public var height(default, null):Float;
public function new(width:Float, height:Float) {
this.width = width;
this.height = height;
}
public function draw(view:IView<Dynamic>):Void {
if (view.geometry.size.fixed.width != width || view.geometry.size.fixed.height != height) {
view.geometry.size.fixed = [width, height];
view.toUpdate();
}
}
}

4
src/main/haxework/gui/skin/Skin.hx
View File

@@ -4,6 +4,10 @@ import flash.display.BitmapData;
class Skin {
public static function size(width:Float, height:Float): ISkin<Dynamic> {
return new SizeSkin(width, height);
}
public static function bitmap(image:BitmapData): ISkin<SpriteView> {
return new BitmapSkin(image);
}