Skip to content

Commit

Permalink
兼容工作完成 25/25
Browse files Browse the repository at this point in the history
  • Loading branch information
@rakuten
rakuten committed Jul 13, 2017
1 parent ab3ebb8 commit ffe05cc
Show file tree
Hide file tree
Showing 19 changed files with 3,163 additions and 2,611 deletions.
2 changes: 1 addition & 1 deletion src/fairygui/GButton.hx
View file
Expand Up @@ -652,7 +652,7 @@ class GButton extends GComponent
}
else
{
if (_relatedController)
if (_relatedController != null)
_relatedController.selectedPageId = _pageOption.id;
}
}
Expand Down
9 changes: 5 additions & 4 deletions src/fairygui/GGroup.hx
View file
Expand Up @@ -162,7 +162,7 @@ class GGroup extends GObject

if (_layout == GroupLayoutType.Horizontal)
{
var curX:Float;
var curX:Float = Math.NaN;
cnt = parent.numChildren;
for (i in 0...cnt)
{
Expand All @@ -182,7 +182,7 @@ class GGroup extends GObject
}
else if (_layout == GroupLayoutType.Vertical)
{
var curY:Float;
var curY:Float = Math.NaN;
cnt = parent.numChildren;
for (i in 0...cnt)
{
Expand Down Expand Up @@ -316,7 +316,7 @@ class GGroup extends GObject
if (_layout == GroupLayoutType.Horizontal)
{
remainSize = lineSize = this.width - (numChildren - 1) * _columnGap;
var curX:Float;
var curX:Float = Math.NaN;
var nw:Float;
for (i in 0...cnt)
{
Expand All @@ -328,6 +328,7 @@ class GGroup extends GObject
curX = Std.int(child.x);
else
child.x = curX;

if (last == i)
nw = remainSize;
else
Expand Down Expand Up @@ -366,7 +367,7 @@ class GGroup extends GObject
else if (_layout == GroupLayoutType.Vertical)
{
remainSize = lineSize = this.height - (numChildren - 1) * _lineGap;
var curY:Float;
var curY:Float = Math.NaN;
var nh:Float;
for (i in 0...cnt)
{
Expand Down
149 changes: 74 additions & 75 deletions src/fairygui/GImage.hx
View file
@@ -1,67 +1,65 @@
package fairygui;

import fairygui.display.UIImage;
import fairygui.GObject;
import fairygui.IColorGear;
import fairygui.PackageItem;

import fairygui.utils.ToolSet;
import openfl.display.Bitmap;
import openfl.display.BitmapData;
import openfl.geom.ColorTransform;
import openfl.geom.Matrix;

import fairygui.display.UIImage;
import fairygui.utils.ToolSet;

class GImage extends GObject implements IColorGear
{
public var color(get, set) : UInt;
public var flip(get, set) : Int;
public var texture(get, set) : BitmapData;
public var color(get, set):UInt;
public var flip(get, set):Int;
public var texture(get, set):BitmapData;

private var _bmdSource:BitmapData;
private var _content : Bitmap;
private var _color : UInt = 0;
private var _flip : Int = 0;
private var _content:Bitmap;
private var _color:UInt = 0;
private var _flip:Int = 0;

public function new()
{
super();
_color = 0xFFFFFF;
}
private function get_color() : UInt

private function get_color():UInt
{
return _color;
}
private function set_color(value : UInt) : UInt

private function set_color(value:UInt):UInt
{
if (_color != value)
if (_color != value)
{
_color = value;
updateGear(4);
applyColor();
}
return value;
}
private function applyColor() : Void

private function applyColor():Void
{
var ct : ColorTransform = _content.transform.colorTransform;
var ct:ColorTransform = _content.transform.colorTransform;
ct.redMultiplier = ((_color >> 16) & 0xFF) / 255;
ct.greenMultiplier = ((_color >> 8) & 0xFF) / 255;
ct.blueMultiplier = (_color & 0xFF) / 255;
_content.transform.colorTransform = ct;
}
private function get_flip() : Int

private function get_flip():Int
{
return _flip;
}
private function set_flip(value : Int) : Int

private function set_flip(value:Int):Int
{
if (_flip != value)
if (_flip != value)
{
_flip = value;
updateBitmap();
Expand All @@ -80,18 +78,18 @@ class GImage extends GObject implements IColorGear
handleSizeChanged();
return value;
}
override private function createDisplayObject() : Void

override private function createDisplayObject():Void
{
_content = new UIImage(this);
setDisplayObject(_content);
}
override public function dispose() : Void

override public function dispose():Void
{
if (!packageItem.loaded)
if (!packageItem.loaded)
packageItem.owner.removeItemCallback(packageItem, __imageLoaded);

if (_content.bitmapData != null && _content.bitmapData != _bmdSource)
{
_content.bitmapData.dispose();
Expand All @@ -100,110 +98,111 @@ class GImage extends GObject implements IColorGear

super.dispose();
}
override public function constructFromResource() : Void

override public function constructFromResource():Void
{
_sourceWidth = packageItem.width;
_sourceHeight = packageItem.height;
_initWidth = _sourceWidth;
_initHeight = _sourceHeight;
setSize(_sourceWidth, _sourceHeight);
if (packageItem.loaded)
__imageLoaded(packageItem)
else
packageItem.owner.addItemCallback(packageItem, __imageLoaded);
sourceWidth = packageItem.width;
sourceHeight = packageItem.height;
initWidth = sourceWidth;
initHeight = sourceHeight;

setSize(sourceWidth, sourceHeight);

if (packageItem.loaded)
__imageLoaded(packageItem);
else
packageItem.owner.addItemCallback(packageItem, __imageLoaded);
}
private function __imageLoaded(pi : PackageItem) : Void

private function __imageLoaded(pi:PackageItem):Void
{
if(_bmdSource!=null)
if (_bmdSource != null)
return;

_bmdSource = pi.image;
_content.bitmapData = _bmdSource;
_content.smoothing = packageItem.smoothing;
updateBitmap();
}
override private function handleSizeChanged() : Void

override private function handleSizeChanged():Void
{
if (packageItem.scale9Grid == null && !packageItem.scaleByTile || _bmdSource!=packageItem.image)
if (packageItem.scale9Grid == null && !packageItem.scaleByTile || _bmdSource != packageItem.image)
_sizeImplType = 1;
else
else
_sizeImplType = 0;
handleScaleChanged();
updateBitmap();
}
private function updateBitmap() : Void

private function updateBitmap():Void
{
if(_bmdSource==null)
if (_bmdSource == null)
return;

var newBmd:BitmapData = _bmdSource;
var w:Int = Std.int(this.width);
var h:Int = Std.int(this.height);

if(w<=0 || h<=0)
if (w <= 0 || h <= 0)
newBmd = null;
else if(_bmdSource==packageItem.image && (_bmdSource.width!=w || _bmdSource.height!=h))
else if (_bmdSource == packageItem.image && (_bmdSource.width != w || _bmdSource.height != h))
{
if(packageItem.scale9Grid!=null)
if (packageItem.scale9Grid != null)
newBmd = ToolSet.scaleBitmapWith9Grid(_bmdSource,
packageItem.scale9Grid, w, h, packageItem.smoothing, packageItem.tileGridIndice);
else if(packageItem.scaleByTile)
else if (packageItem.scaleByTile)
newBmd = ToolSet.tileBitmap(_bmdSource, _bmdSource.rect, w, h);
}

if(newBmd!=null && _flip!=FlipType.None)
if (newBmd != null && _flip != FlipType.None)
{
var mat:Matrix = new Matrix();
var a:Int=1;
var b:Int=1;
if(_flip==FlipType.Both)
var a:Int = 1;
var b:Int = 1;
if (_flip == FlipType.Both)
{
mat.scale(-1,-1);
mat.scale(-1, -1);
mat.translate(newBmd.width, newBmd.height);
}
else if(_flip==FlipType.Horizontal)
else if (_flip == FlipType.Horizontal)
{
mat.scale(-1, 1);
mat.translate(newBmd.width, 0);
}
else
{
mat.scale(1,-1);
mat.scale(1, -1);
mat.translate(0, newBmd.height);
}

var bmdAfterFlip:BitmapData = new BitmapData(newBmd.width,newBmd.height,newBmd.transparent,0);
bmdAfterFlip.draw(newBmd, mat);
var bmdAfterFlip:BitmapData = new BitmapData(newBmd.width, newBmd.height, newBmd.transparent, 0);
bmdAfterFlip.draw(newBmd, mat, null, null, null, packageItem.smoothing);

if(newBmd!=_bmdSource)
if (newBmd != _bmdSource)
newBmd.dispose();

newBmd = bmdAfterFlip;
}
var oldBmd:BitmapData = _content.bitmapData;
if(oldBmd!=newBmd)
if (oldBmd != newBmd)
{
if(oldBmd != null && oldBmd!=_bmdSource)
if (oldBmd != null && oldBmd != _bmdSource)
oldBmd.dispose();
_content.bitmapData = newBmd;
_content.smoothing = packageItem.smoothing;
}
}
override public function setup_beforeAdd(xml : FastXML) : Void

override public function setup_beforeAdd(xml:FastXML):Void
{
super.setup_beforeAdd(xml);
var str : String;

var str:String;
str = xml.att.color;
if (str != null)
if (str != null)
this.color = ToolSet.convertFromHtmlColor(str);

str = xml.att.flip;
if (str != null)
this.flip = FlipType.parse(str);
Expand Down

0 comments on commit ffe05cc

Please sign in to comment.