Skip to content

Commit 099e6e1

Browse files
author
as
committed
re
1 parent 89a04c8 commit 099e6e1

File tree

5 files changed

+38
-25
lines changed

5 files changed

+38
-25
lines changed

bin/Falcon.swc

-51 Bytes
Binary file not shown.

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

Lines changed: 11 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,13 @@ package com.hendrix.feathers.controls.flex
5353
private var _horizontalAlign: String = null;
5454
private var _verticalAlign: String = null;
5555

56-
private var _isSensitiveToParent: Boolean = true;
56+
private var _isSensitiveToParent: Boolean = false;
5757

5858
private var _id: String = null;
5959

6060
protected var _backgroundSkin: DisplayObject = null;
6161

62-
protected var _breakParentSensitivityAfter: Number = 5;
62+
protected var _breakParentSensitivityAfter: Number = 3;
6363

6464
/**
6565
* flex comp implementation. extend this class to use it.
@@ -413,18 +413,14 @@ package com.hendrix.feathers.controls.flex
413413
var parentWidthDop: DisplayObject = _relativeCalcWidthParent ? _relativeCalcWidthParent as DisplayObject : getValidAncestorWidth() as DisplayObject;
414414
var parentHeightDop: DisplayObject = _relativeCalcHeightParent ? _relativeCalcHeightParent as DisplayObject : getValidAncestorHeight() as DisplayObject;
415415

416-
if(parentHeightDop == parentWidthDop) {
417-
}
418-
else {
419-
if(parentHeightDop) {
420-
if(on)
421-
parentHeightDop.addEventListener(FeathersEventType.RESIZE, onParentResized);
422-
else
423-
parentHeightDop.removeEventListener(FeathersEventType.RESIZE, onParentResized);
424-
}
416+
if(parentHeightDop) {
417+
if(on)
418+
parentHeightDop.addEventListener(FeathersEventType.RESIZE, onParentResized);
419+
else
420+
parentHeightDop.removeEventListener(FeathersEventType.RESIZE, onParentResized);
425421
}
426422

427-
if(parentWidthDop) {
423+
if(parentWidthDop && parentWidthDop!=parentHeightDop) {
428424
if(on)
429425
parentWidthDop.addEventListener(FeathersEventType.RESIZE, onParentResized);
430426
else
@@ -439,10 +435,11 @@ package com.hendrix.feathers.controls.flex
439435
applyAlignment();
440436
}
441437

442-
private function onParentResized():void
438+
private function onParentResized(evt:Event):void
443439
{
444440
if(_breakParentSensitivityAfter <= 0) {
445-
internal_parent_observer(false);
441+
//internal_parent_observer(false);
442+
evt.currentTarget.removeEventListener(FeathersEventType.RESIZE, onParentResized);
446443

447444
return;
448445
}

src/com/hendrix/feathers/controls/flex/FlexList.as

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ package com.hendrix.feathers.controls.flex
1010
import feathers.layout.VerticalLayout;
1111

1212
import starling.display.DisplayObject;
13+
import starling.events.Event;
1314

1415
/**
1516
* a Feather list that implements IFlexComp
@@ -44,7 +45,7 @@ package com.hendrix.feathers.controls.flex
4445
private var _verticalAlign: String = null;
4546

4647
private var _isSensitiveToParent: Boolean = true;
47-
private var _breakParentSensitivityAfter: Number = 5;
48+
private var _breakParentSensitivityAfter: Number = 3;
4849

4950
private var _id: String = null;
5051

@@ -371,12 +372,19 @@ package com.hendrix.feathers.controls.flex
371372

372373
}
373374

374-
private function onParentResized():void
375+
private function onParentResized(evt:Event):void
375376
{
376-
if(_breakParentSensitivityAfter-- == 0)
377-
internal_parent_observer(false);
378-
379-
invalidate(INVALIDATION_FLAG_SIZE);
377+
if(_breakParentSensitivityAfter <= 0) {
378+
//internal_parent_observer(false);
379+
evt.currentTarget.removeEventListener(FeathersEventType.RESIZE, onParentResized);
380+
381+
return;
382+
}
383+
384+
_breakParentSensitivityAfter -= 1;
385+
386+
trace("onParentResized::" + _breakParentSensitivityAfter);
387+
invalidate(INVALIDATION_FLAG_SIZE);
380388
}
381389

382390
private function isParentDependant():void

src/com/hendrix/feathers/controls/flex/FlexTextInput.as

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ package com.hendrix.feathers.controls.flex
6363
private var _verticalCenter: Number = NaN;
6464

6565
private var _isSensitiveToParent: Boolean = true;
66-
protected var _breakParentSensitivityAfter: Number = 5;
66+
protected var _breakParentSensitivityAfter: Number = 3;
6767

6868
private var _id: String = null;
6969

@@ -533,12 +533,19 @@ package com.hendrix.feathers.controls.flex
533533
super.text = "";
534534
}
535535

536-
private function onParentResized():void
536+
private function onParentResized(evt:Event):void
537537
{
538-
if(_breakParentSensitivityAfter-- == 0)
539-
internal_parent_observer(false);
538+
if(_breakParentSensitivityAfter <= 0) {
539+
//internal_parent_observer(false);
540+
evt.currentTarget.removeEventListener(FeathersEventType.RESIZE, onParentResized);
541+
542+
return;
543+
}
544+
545+
_breakParentSensitivityAfter -= 1;
540546

541-
invalidate(INVALIDATION_FLAG_SIZE);
547+
trace("onParentResized::" + _breakParentSensitivityAfter);
548+
invalidate(INVALIDATION_FLAG_SIZE);
542549
}
543550

544551
private function onChange(event:Event):void

src/com/hendrix/feathers/controls/flex/PullDrawer.as

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ package com.hendrix.feathers.controls.flex
2323
* </ul>
2424
* </p>
2525
* a common scenario is to have <code>this.mainContent = new Quad(1,1)</code>, a zero height main content
26+
*
2627
* @author Tomer Shalev
2728
*/
2829
public class PullDrawer extends FlexComp

0 commit comments

Comments
 (0)