Skip to content

Commit 3caccb1

Browse files
author
as
committed
some improvements
1 parent 18d44a1 commit 3caccb1

File tree

8 files changed

+93
-19
lines changed

8 files changed

+93
-19
lines changed

‎bin/Falcon.swc‎

355 Bytes
Binary file not shown.

‎src/com/hendrix/feathers/controls/flex/Dialog.as‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,8 @@ package com.hendrix.feathers.controls.flex
5353

5454
private var _dialogContent: DisplayObject = null;
5555
private var _container: FlexComp = null;
56+
private var _contentPercentWidth:Number = 0.95;
57+
private var _contentPercentHeight:Number = 0.95;
5658

5759
/**
5860
* a Dialog control <br>

‎src/com/hendrix/feathers/controls/flex/FlexComp.as‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ package com.hendrix.feathers.controls.flex
44

55
import flash.geom.Rectangle;
66

7+
import feathers.controls.Button;
78
import feathers.core.FeathersControl;
89
import feathers.core.IFeathersControl;
910
import feathers.events.FeathersEventType;
@@ -65,6 +66,9 @@ package com.hendrix.feathers.controls.flex
6566
protected var _backgroundSkin: DisplayObject = null;
6667

6768
protected var _breakParentSensitivityAfter: Number = 3;
69+
70+
protected var _onTriggered: Function = null;
71+
protected var _button_trigger: Button = null;
6872

6973
/**
7074
* flex comp implementation. extend this class to use it.
@@ -86,6 +90,22 @@ package com.hendrix.feathers.controls.flex
8690
super();
8791
}
8892

93+
/**
94+
*
95+
* listen to trigger events on theis control
96+
*/
97+
public function get onTriggered():Function { return _onTriggered; }
98+
public function set onTriggered(value:Function):void
99+
{
100+
_onTriggered = value;
101+
102+
if(_onTriggered) {
103+
_button_trigger = _button_trigger ? _button_trigger : new Button();
104+
105+
_button_trigger.addEventListener(Event.TRIGGERED, btn_onTriggered);
106+
}
107+
}
108+
89109
public function get backgroundSkin():DisplayObject { return _backgroundSkin; }
90110
public function set backgroundSkin(value:DisplayObject):void
91111
{
@@ -120,6 +140,8 @@ package com.hendrix.feathers.controls.flex
120140
_relativeCalcWidthParent = null;
121141
_relativeCalcHeightParent = null;
122142

143+
_button_trigger = null;
144+
123145
var parentWidthDop: DisplayObject = _relativeCalcWidthParent ? _relativeCalcWidthParent as DisplayObject : getValidAncestorWidth() as DisplayObject;
124146
var parentHeightDop: DisplayObject = _relativeCalcHeightParent ? _relativeCalcHeightParent as DisplayObject : getValidAncestorHeight() as DisplayObject;
125147

@@ -469,6 +491,7 @@ package com.hendrix.feathers.controls.flex
469491
}
470492

471493
validateBackground();
494+
layoutButton();
472495
}
473496

474497
protected function internal_parent_observer(on: Boolean = true):void {
@@ -490,6 +513,21 @@ package com.hendrix.feathers.controls.flex
490513
}
491514
}
492515

516+
private function layoutButton():void {
517+
if(_button_trigger == null)
518+
return;
519+
520+
addChild(_button_trigger);
521+
522+
_button_trigger.width = width;
523+
_button_trigger.height = height;
524+
}
525+
526+
private function btn_onTriggered(event:Event):void
527+
{
528+
_onTriggered(event);
529+
}
530+
493531
private function onCreationComplete(evt:Event):void
494532
{
495533
removeEventListener(FeathersEventType.CREATION_COMPLETE, onCreationComplete);

‎src/com/hendrix/feathers/controls/flex/FlexImage.as‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ package com.hendrix.feathers.controls.flex
4545

4646
private var _flagDebugMode: Boolean = false;
4747
private var _quad_debug: Quad;
48-
48+
4949
private var _color: int = -1;
5050

5151
/**
@@ -62,7 +62,7 @@ package com.hendrix.feathers.controls.flex
6262
{
6363
super();
6464
}
65-
65+
6666
/**
6767
* a color to tint the image with.
6868
*
@@ -224,7 +224,7 @@ package com.hendrix.feathers.controls.flex
224224
var ar: Number;
225225
var arW: Number;
226226
var arH: Number;
227-
227+
228228
switch(_scaleMode)
229229
{
230230
case SCALEMODE_STRECTH:

‎src/com/hendrix/feathers/controls/flex/HGroup.as‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,8 @@ package com.hendrix.feathers.controls.flex
275275
if(dataInvalid || sizeInvalid || itemsMovedInvalid)
276276
{
277277
if(_dataProvider) {
278-
calcW = isNaN(_dataProvider[ix].percentWidth) ? (isNaN(_dataProvider[ix].width) ? doRef.width : _dataProvider[ix].width) : !(_dataProvider[ix].hasOwnProperty("relativeCalcParent")) ? (_dataProvider[ix].percentWidth/100)*width : (_dataProvider[ix].percentWidth/100)*_dataProvider[ix].relativeCalcParent.width;
279-
calcH = isNaN(_dataProvider[ix].percentHeight) ? (isNaN(_dataProvider[ix].height) ? doRef.height : _dataProvider[ix].height) : !(_dataProvider[ix].hasOwnProperty("relativeCalcParent")) ? (_dataProvider[ix].percentHeight/100)*height : (_dataProvider[ix].percentHeight/100)*_dataProvider[ix].relativeCalcParent.height;
278+
calcW = isNaN(_dataProvider[ix].percentWidth) ? (isNaN(_dataProvider[ix].width) ? doRef.width : _dataProvider[ix].width) : !(_dataProvider[ix].hasOwnProperty("relativeCalcParent")) ? (_dataProvider[ix].percentWidth/100)*width : (_dataProvider[ix].percentWidth/100) * _dataProvider[ix].relativeCalcParent.width;
279+
calcH = isNaN(_dataProvider[ix].percentHeight) ? (isNaN(_dataProvider[ix].height) ? doRef.height : _dataProvider[ix].height) : !(_dataProvider[ix].hasOwnProperty("relativeCalcParent")) ? (_dataProvider[ix].percentHeight/100)*height : (_dataProvider[ix].percentHeight/100) * _dataProvider[ix].relativeCalcParent.height;
280280

281281
if(calcW)
282282
doRef.width = calcW;

‎src/com/hendrix/feathers/controls/flex/VGroup.as‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,8 @@ package com.hendrix.feathers.controls.flex
275275
{
276276
super.draw();
277277

278+
id;width;height;x;y
279+
278280
var sizeInvalid: Boolean = isInvalid(INVALIDATION_FLAG_SIZE);
279281
var layoutInvalid: Boolean = isInvalid(INVALIDATION_FLAG_LAYOUT);
280282
var dataInvalid: Boolean = isInvalid(INVALIDATION_FLAG_DATA);
@@ -318,7 +320,7 @@ package com.hendrix.feathers.controls.flex
318320
calcH = 0;
319321

320322
calcW = isNaN(_dataProvider[ix].percentWidth) ? (isNaN(_dataProvider[ix].width) ? 0 : _dataProvider[ix].width) : !(_dataProvider[ix].hasOwnProperty("relativeCalcParent")) ? (_dataProvider[ix].percentWidth/100)*width : (_dataProvider[ix].percentWidth/100)*_dataProvider[ix].relativeCalcParent.width;
321-
calcH = isNaN(_dataProvider[ix].percentHeight) ? ((isNaN(_dataProvider[ix].height) ? 0 : _dataProvider[ix].height)) : !(_dataProvider[ix].hasOwnProperty("relativeCalcParent")) ? (_dataProvider[ix].percentHeight/100)*height : (_dataProvider[ix].percentHeight/100)*_dataProvider[ix].relativeCalcParent.height;
323+
calcH = isNaN(_dataProvider[ix].percentHeight) ? ((isNaN(_dataProvider[ix].height) ? 0 : _dataProvider[ix].height)) : !(_dataProvider[ix].hasOwnProperty("relativeCalcParent")) ? (_dataProvider[ix].percentHeight/100)*height : (_dataProvider[ix].percentHeight/100)*_dataProvider[ix].relativeCalcParent.height;
322324

323325
if(calcW)
324326
doRef.width = calcW;

‎src/com/hendrix/feathers/controls/flex/WarningDialog.as‎

Lines changed: 44 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,20 @@ package com.hendrix.feathers.controls.flex
5050
private var _quadStrip1: Quad = null;
5151
private var _quadStrip2: Quad = null;
5252

53+
private var _textFormat: TextFormat= null;
54+
5355
private var _tweenFade: Tween = null;
5456

57+
public function set btnNo(value:Button):void
58+
{
59+
_btnNo = value;
60+
}
61+
62+
public function set btnYes(value:Button):void
63+
{
64+
_btnYes = value;
65+
}
66+
5567
/**
5668
* callback for user action
5769
*/
@@ -74,9 +86,9 @@ package com.hendrix.feathers.controls.flex
7486
*/
7587
private var _textNo: String;
7688

77-
private var _dialogPercentWidth:Number = NaN;
78-
private var _dialogPercentHeight:Number = NaN;
79-
private var _fontSizePercent:Number = NaN;
89+
private var _dialogPercentWidth: Number = NaN;
90+
private var _dialogPercentHeight: Number = NaN;
91+
private var _fontSizePercent: Number = NaN;
8092

8193

8294
/**
@@ -115,6 +127,12 @@ package com.hendrix.feathers.controls.flex
115127
Starling.juggler.add(_tweenFade);
116128
}
117129

130+
public function get textFormat():TextFormat { return _textFormat; }
131+
public function set textFormat(value:TextFormat):void
132+
{
133+
_textFormat = value;
134+
}
135+
118136
/**
119137
* warning text
120138
*/
@@ -166,8 +184,8 @@ package com.hendrix.feathers.controls.flex
166184
{
167185
_colorBg = value;
168186

169-
if(_quadBgDark) {
170-
_quadBgDark.color = _colorBg;
187+
if(_quadBg) {
188+
_quadBg.color = _colorBg;
171189
}
172190
}
173191

@@ -212,21 +230,33 @@ package com.hendrix.feathers.controls.flex
212230
{
213231
super.initialize();
214232

215-
var tf_btns: TextFormat = new TextFormat("arial11", 22, 0x3C3C3C);
216-
var tf_lbl: TextFormat = new TextFormat("arial11", 22, 0x3C3C3C);
233+
var tf_btns: TextFormat = _textFormat ? _textFormat : new TextFormat("arial11", 22, 0x3C3C3C);
234+
var tf_lbl: TextFormat = _textFormat ? _textFormat : new TextFormat("arial11", 22, 0x3C3C3C);
235+
236+
_btnYes = _btnYes ? _btnYes : CompsFactory.newButton(0x7DD9FF, null, btnYes_onTriggered, tf_btns, _textYes);
237+
_btnNo = _btnNo ? _btnNo : CompsFactory.newButton(0x7DD9FF, null, btnNo_onTriggered, tf_btns, _textNo);
217238

218-
_btnYes = CompsFactory.newButton(0x7DD9FF, null, btnYes_onTriggered, tf_btns, _textYes);
219-
_btnNo = CompsFactory.newButton(0x7DD9FF, null, btnNo_onTriggered, tf_btns, _textNo);
239+
_btnYes.addEventListener(Event.TRIGGERED, btnYes_onTriggered);
240+
_btnNo.addEventListener(Event.TRIGGERED, btnNo_onTriggered);
241+
242+
if(_btnYes.defaultLabelProperties.textFormat == null)
243+
_btnYes.defaultLabelProperties.textFormat = tf_btns;
244+
if(_btnNo.defaultLabelProperties.textFormat == null)
245+
_btnNo.defaultLabelProperties.textFormat = tf_btns;
246+
247+
_btnYes.label = _textYes;
248+
_btnNo.label = _textNo;
220249

221250
_btnYes.defaultLabelProperties.embedFonts = true;
222251
_btnNo.defaultLabelProperties.embedFonts = true;
252+
223253
_btnYes.horizontalAlign = Button.HORIZONTAL_ALIGN_CENTER;
224254
_btnNo.horizontalAlign = Button.HORIZONTAL_ALIGN_CENTER;
225255

226256
_lblWarning = CompsFactory.newLabel(_textWarning, tf_lbl, true, true, TextAlign.CENTER);
227257

228-
_quadBg = new Quad(1, 1, 0xffffff);
229-
_quadBgDark = new Quad(1, 1, _colorBg);
258+
_quadBg = new Quad(1, 1, _colorBg);
259+
_quadBgDark = new Quad(1, 1, 0x00);
230260

231261
_quadBgDark.alpha = 0.4;
232262

@@ -291,6 +321,8 @@ package com.hendrix.feathers.controls.flex
291321
_btnYes.defaultLabelProperties.textFormat = null;
292322
_btnYes.defaultLabelProperties.textFormat = tf;
293323

324+
//_btnNo.height = 0;
325+
//_btnYes.height = 0;
294326
_btnNo.validate();
295327
_btnYes.validate();
296328

@@ -325,7 +357,7 @@ package com.hendrix.feathers.controls.flex
325357

326358
if(_textHeadline)
327359
{
328-
var tf_lbl: TextFormat = new TextFormat("arial11", 22, 0x3C3C3C);
360+
var tf_lbl: TextFormat = _textFormat ? _textFormat : new TextFormat("arial11", 22, 0x3C3C3C);
329361
_lblHeadLine = CompsFactory.newLabel(_textHeadline, tf_lbl, false, true, TextAlign.CENTER);
330362
_lblHeadLine.textRendererProperties.textFormat.size = isNaN(_fontSizePercent) ? width * 0.05 : height * _fontSizePercent / 100;;
331363

‎src/com/hendrix/feathers/controls/utils/SCalendarInfo.as‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ package com.hendrix.feathers.controls.utils
5555
*/
5656
static public function dateDeltaSeconds(date:Date):uint
5757
{
58-
var sec: uint = (date.time - (new Date()).time) / SECOND;
58+
var sec: uint = Math.abs(date.time - (new Date()).time) / SECOND;
5959

6060
return sec;
6161
}

0 commit comments

Comments
 (0)