You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by pe...@apache.org on 2013/06/19 22:18:57 UTC
git commit: [flex-asjs] [refs/heads/develop] - Alert and SimpleAlert
use metrics to account for space taken by borders.
Updated Branches:
refs/heads/develop 10e22bde6 -> fc36f4a7f
Alert and SimpleAlert use metrics to account for space taken by borders.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/fc36f4a7
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/fc36f4a7
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/fc36f4a7
Branch: refs/heads/develop
Commit: fc36f4a7f5d7d2b64253ae4e6f79dcb71aa42674
Parents: 10e22bd
Author: Peter Ent <pe...@apache.org>
Authored: Wed Jun 19 16:18:49 2013 -0400
Committer: Peter Ent <pe...@apache.org>
Committed: Wed Jun 19 16:18:49 2013 -0400
----------------------------------------------------------------------
.../flex/html/staticControls/beads/AlertBead.as | 35 ++++++++------------
.../staticControls/beads/SimpleAlertBead.as | 20 ++++-------
2 files changed, 21 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc36f4a7/frameworks/as/src/org/apache/flex/html/staticControls/beads/AlertBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/AlertBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/AlertBead.as
index dcbd433..49d5cf1 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/AlertBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/AlertBead.as
@@ -22,7 +22,7 @@ package org.apache.flex.html.staticControls.beads
import org.apache.flex.core.IMeasurementBead;
import org.apache.flex.core.IStrand;
import org.apache.flex.core.UIBase;
- import org.apache.flex.core.ValuesManager;
+ import org.apache.flex.core.UIMetrics;
import org.apache.flex.createjs.staticControls.Label;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
@@ -30,6 +30,7 @@ package org.apache.flex.html.staticControls.beads
import org.apache.flex.html.staticControls.ControlBar;
import org.apache.flex.html.staticControls.TextButton;
import org.apache.flex.html.staticControls.TitleBar;
+ import org.apache.flex.utils.BeadMetrics;
public class AlertBead implements IAlertBead
{
@@ -112,31 +113,23 @@ package org.apache.flex.html.staticControls.beads
var ctrlMeasure:IMeasurementBead = _controlBar.measurementBead;
var maxWidth:Number = Math.max(titleMeasure.measuredWidth, ctrlMeasure.measuredWidth, labelMeasure.measuredWidth);
- var borderThickness:Object = ValuesManager.valuesImpl.getValue(_strand,"border-thickness");
- var borderOffset:Number;
- if( borderThickness == null ) {
- borderOffset = 0;
- }
- else {
- borderOffset = Number(borderThickness);
- if( isNaN(borderOffset) ) borderOffset = 0;
- }
-
- _titleBar.x = borderOffset;
- _titleBar.y = borderOffset;
- _titleBar.width = maxWidth - 2*borderOffset;
+ var metrics:UIMetrics = BeadMetrics.getMetrics(_strand);
+
+ _titleBar.x = metrics.x;
+ _titleBar.y = metrics.y;
+ _titleBar.width = maxWidth - 2*metrics.x;
// content placement here
- _label.x = borderOffset;
- _label.y = borderOffset + _titleBar.height + 2;
- _label.width = maxWidth - 2*borderOffset;
+ _label.x = metrics.x;
+ _label.y = metrics.y + _titleBar.height + 2;
+ _label.width = maxWidth - 2*metrics.x;
- _controlBar.x = borderOffset;
- _controlBar.y = borderOffset + _label.y + _label.height + 2;
- _controlBar.width = maxWidth - 2*borderOffset;
+ _controlBar.x = metrics.x;
+ _controlBar.y = metrics.x + _label.y + _label.height + 2;
+ _controlBar.width = maxWidth - 2*metrics.x;
UIBase(_strand).width = maxWidth;
- UIBase(_strand).height = _controlBar.y + _controlBar.height + borderOffset;
+ UIBase(_strand).height = _controlBar.y + _controlBar.height + metrics.y;
}
private function handleOK(event:Event):void
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/fc36f4a7/frameworks/as/src/org/apache/flex/html/staticControls/beads/SimpleAlertBead.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/html/staticControls/beads/SimpleAlertBead.as b/frameworks/as/src/org/apache/flex/html/staticControls/beads/SimpleAlertBead.as
index 1041d07..d6c97a8 100644
--- a/frameworks/as/src/org/apache/flex/html/staticControls/beads/SimpleAlertBead.as
+++ b/frameworks/as/src/org/apache/flex/html/staticControls/beads/SimpleAlertBead.as
@@ -29,12 +29,14 @@ package org.apache.flex.html.staticControls.beads
import org.apache.flex.core.IStrand;
import org.apache.flex.core.ITextBead;
import org.apache.flex.core.UIBase;
+ import org.apache.flex.core.UIMetrics;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.IEventDispatcher;
import org.apache.flex.events.ValueChangeEvent;
import org.apache.flex.html.staticControls.Label;
import org.apache.flex.html.staticControls.TextButton;
+ import org.apache.flex.utils.BeadMetrics;
public class SimpleAlertBead implements ISimpleAlertBead
{
@@ -79,25 +81,17 @@ package org.apache.flex.html.staticControls.beads
}
var maxWidth:Number = Math.max(UIBase(_strand).width,ruler.measuredWidth);
- var borderThickness:Object = ValuesManager.valuesImpl.getValue(_strand,"border-thickness");
- var borderOffset:Number;
- if( borderThickness == null ) {
- borderOffset = 0;
- }
- else {
- borderOffset = Number(borderThickness);
- if( isNaN(borderOffset) ) borderOffset = 0;
- }
+ var metrics:UIMetrics = BeadMetrics.getMetrics(_strand);
- messageLabel.x = borderOffset;
- messageLabel.y = borderOffset;
- messageLabel.width = maxWidth-2*borderOffset;
+ messageLabel.x = metrics.x;
+ messageLabel.y = metrics.y;
+ messageLabel.width = maxWidth-2*metrics.x;
okButton.x = (UIBase(_strand).width - okButton.width)/2;
okButton.y = messageLabel.height + 20;
UIBase(_strand).width = maxWidth;
- UIBase(_strand).height = messageLabel.height + okButton.height + 20 + 2*borderOffset;
+ UIBase(_strand).height = messageLabel.height + okButton.height + 20 + 2*metrics.x;
}
private function handleOK(event:Event):void