You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by pe...@apache.org on 2018/03/22 18:30:59 UTC
[royale-asjs] branch feature/MXRoyale updated: Added mx:Text.
Enabled more properties such as selectable. Updated ControlsExample.
This is an automated email from the ASF dual-hosted git repository.
pent pushed a commit to branch feature/MXRoyale
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
The following commit(s) were added to refs/heads/feature/MXRoyale by this push:
new 34d0f1c Added mx:Text. Enabled more properties such as selectable. Updated ControlsExample.
34d0f1c is described below
commit 34d0f1cea92fafe669d41cd328fd647363052859
Author: Peter Ent <pe...@apache.org>
AuthorDate: Thu Mar 22 14:30:55 2018 -0400
Added mx:Text. Enabled more properties such as selectable. Updated ControlsExample.
---
.../src/main/royale/ControlsExample.mxml | 20 +-
.../src/main/resources/mx-royale-manifest.xml | 1 +
.../MXRoyale/src/main/royale/mx/controls/Label.as | 73 ++-
.../MXRoyale/src/main/royale/mx/controls/Text.as | 545 +++++++++++++++++++++
.../src/main/royale/mx/controls/TextArea.as | 1 -
.../src/main/royale/mx/core/UIComponent.as | 18 +-
6 files changed, 639 insertions(+), 19 deletions(-)
diff --git a/examples/mxroyale/ControlsExample/src/main/royale/ControlsExample.mxml b/examples/mxroyale/ControlsExample/src/main/royale/ControlsExample.mxml
index f8b931a..52f717f 100644
--- a/examples/mxroyale/ControlsExample/src/main/royale/ControlsExample.mxml
+++ b/examples/mxroyale/ControlsExample/src/main/royale/ControlsExample.mxml
@@ -42,16 +42,24 @@ limitations under the License.
<mx:VBox >
<mx:Label text="Hello World"/>
- <mx:Button label="Push Me" />
- <mx:Button label="Green" icon="assets/smallgreenrect.jpg" />
- <mx:Image source="assets/smallgreenrect.jpg" />
+ <mx:Button label="Push Me" toolTip="I do nothing" />
+ <mx:Button label="Green" icon="assets/smallgreenrect.jpg" toolTip="I also do nothing" />
+ <mx:Image source="assets/smallgreenrect.jpg" toolTip="Green Square" />
+ <mx:Text width="200" height="60" toolTip="More than meets the eye.">
+ <mx:html><![CDATA[
+ This is <b>Text!</b> This more than a few words in it to show how
+ it works and <b>wraps</b>.
+ ]]></mx:html>
+ </mx:Text>
</mx:VBox>
<mx:HBox>
<mx:Label text="Hello World"/>
- <mx:Button label="Push Me" />
- <mx:Button label="Green" icon="assets/smallgreenrect.jpg" />
- <mx:Image source="assets/smallgreenrect.jpg" />
+ <mx:Button label="Push Me" toolTip="I do nothing" />
+ <mx:Button label="Green" icon="assets/smallgreenrect.jpg" toolTip="I also do nothing" />
+ <mx:Image source="assets/smallgreenrect.jpg" toolTip="Green Square" />
</mx:HBox>
+ <mx:TextArea width="200" height="100" text="This is the TextArea control!"
+ displayAsPassword="true" maxChars="100"/>
</mx:Application>
\ No newline at end of file
diff --git a/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml b/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
index 2d57f6b..1448a50 100644
--- a/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
+++ b/frameworks/projects/MXRoyale/src/main/resources/mx-royale-manifest.xml
@@ -28,6 +28,7 @@
<component id="Label" class="mx.controls.Label" />
<component id="RadioButton" class="mx.controls.RadioButton" />
<component id="RadioButtonGroup" class="mx.controls.RadioButtonGroup" />
+ <component id="Text" class="mx.controls.Text" />
<component id="TextArea" class="mx.controls.TextArea" />
<component id="TextInput" class="mx.controls.TextInput" />
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as
index 3ad20ac..beae276 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Label.as
@@ -37,13 +37,9 @@ import mx.controls.listClasses.IDropInListItemRenderer;
import mx.controls.listClasses.IListItemRenderer;
*/
import mx.core.IDataRenderer;
-/*
-import mx.core.IFlexModuleFactory;
-import mx.core.IFontContextComponent;
-import mx.core.IUITextField;
-*/
import mx.core.UIComponent;
import mx.events.FlexEvent;
+
/*
import mx.core.UITextField;
import mx.core.mx_internal;
@@ -52,6 +48,7 @@ use namespace mx_internal;
*/
COMPILE::JS
{
+ import window.Text;
import org.apache.royale.html.util.addElementToWrapper;
import org.apache.royale.core.WrappedHTMLElement;
}
@@ -320,8 +317,66 @@ public class Label extends UIComponent
// Properties
//
//--------------------------------------------------------------------------
-
-
+
+ //----------------------------------
+ // selectable
+ //----------------------------------
+
+ /**
+ * @private
+ * Storage for selectable property.
+ */
+ private var _selectable:Boolean = true;
+
+ /**
+ * @private
+ * Change flag for selectable property.
+ */
+ private var selectableChanged:Boolean;
+
+ [Inspectable(category="General", defaultValue="true")]
+
+ /**
+ * Specifies whether the text can be selected.
+ * Making the text selectable lets you copy text from the control.
+ *
+ * <p>When a <code>link</code> event is specified in the Label control, the <code>selectable</code> property must be set
+ * to <code>true</code> to execute the <code>link</code> event.</p>
+ *
+ * @default false;
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Flex 3
+ */
+ public function get selectable():Boolean
+ {
+ return _selectable;
+ }
+
+ /**
+ * @private
+ */
+ public function set selectable(value:Boolean):void
+ {
+ if (value == selectable)
+ return;
+
+ _selectable = value;
+ selectableChanged = true;
+
+ COMPILE::JS {
+ element.style["-webkit-touch-callout"] = value ? "auto" : "none";
+ element.style["-webkit-user-select"] = value ? "auto" : "none";
+ element.style["-khtml-user-select"] = value ? "auto" : "none";
+ element.style["-moz-user-select"] = value ? "auto" : "none";
+ element.style["-ms-user-select"] = value ? "auto" : "none";
+ element.style["-user-select"] = value ? "auto" : "none";
+ }
+
+ invalidateProperties();
+ }
//----------------------------------
// data
@@ -597,7 +652,7 @@ public class Label extends UIComponent
COMPILE::JS
- protected var textNode:Text;
+ protected var textNode:window.Text;
COMPILE::JS
private var _text:String = "";
@@ -670,7 +725,7 @@ public class Label extends UIComponent
{
addElementToWrapper(this,'span');
- textNode = document.createTextNode(_text) as Text;
+ textNode = document.createTextNode(_text) as window.Text;
element.appendChild(textNode);
element.style.whiteSpace = "nowrap";
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Text.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Text.as
new file mode 100644
index 0000000..672ec1f
--- /dev/null
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/Text.as
@@ -0,0 +1,545 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+// Licensed to the Apache Software Foundation (ASF) under one or more
+// contributor license agreements. See the NOTICE file distributed with
+// this work for additional information regarding copyright ownership.
+// The ASF licenses this file to You under the Apache License, Version 2.0
+// (the "License"); you may not use this file except in compliance with
+// the License. You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+
+package mx.controls
+{
+COMPILE::JS {
+ import goog.DEBUG;
+ import goog.events;
+ import org.apache.royale.core.WrappedHTMLElement;
+ import org.apache.royale.html.util.addElementToWrapper;
+}
+/*
+import mx.core.mx_internal;
+import mx.core.UITextField;
+import mx.events.FlexEvent;
+
+use namespace mx_internal;
+*/
+
+/**
+ * The Text control displays multiline, noneditable text.
+ * Use the Label control if you need only a single line of text.
+ *
+ * <p>The Text control does not support scroll bars.
+ * If you need scrolling, you should use a non-editable TextArea control.</p>
+ *
+ * <p>You can format the text in a Text control using HTML tags,
+ * which are applied after the control's CSS styles are applied.
+ * You can also put padding around the four sides of the text.</p>
+ *
+ * <p>The text in a Text control is selectable by default,
+ * but you can make it unselectable by setting the <code>selectable</code>
+ * property to <code>false</code>.</p>
+ *
+ * <p>If the control is not as wide as the text, the text will wordwrap.
+ * The text is always aligned top-left in the control.</p>
+ *
+ * <p>To size a Text component, it's common to specify an explicit width
+ * and let Flex determine the height as required to display all the text.
+ * If you specify an explicit height, some of the text may get clipped;
+ * unlike Label, Text does not truncate its text with "...".
+ * It's also common to use percentage widths and heights with Text.</p>
+ *
+ * <p>If you leave both the width and the height unspecified,
+ * Flex calculates them based on any explicit line breaks
+ * in the text, with no wordwrapping within lines.
+ * For example, if you set the <code>text</code> property,
+ * the newline character <code>"\n"</code> causes a line break.
+ * If you set the <code>htmlText</code> property, the HTML markup
+ * <code><br></code> causes a line break.
+ * If your <code>text</code> or <code>htmlText</code> is lengthy
+ * and doesn't contain line breaks, you can get a very wide Text
+ * component; you can set the <code>maxWidth</code> to limit
+ * how wide the component is allowed to grow.</p>
+ *
+ * <p>Text controls do not have backgrounds or borders
+ * and cannot take focus.</p>
+ *
+ * <p>The Text control has the following default sizing characteristics:</p>
+ * <table class="innertable">
+ * <tr>
+ * <th>Characteristic</th>
+ * <th>Description</th>
+ * </tr>
+ * <tr>
+ * <td>Default size</td>
+ * <td>Flex sizes the control to fit the text, with the width long enough to fit the longest line of text and height tall enough to fit the number of lines. If you do not specify a pixel width, the height is determined by the number of explicit line breaks in the text string. If the text length changes, the control resizes to fit the new text.</td>
+ * </tr>
+ * <tr>
+ * <td>Minimum size</td>
+ * <td>0 pixels.</td>
+ * </tr>
+ * <tr>
+ * <td>ChMaximum sizear03</td>
+ * <td>10000 by 10000 pixels</td>
+ * </tr>
+ * </table>
+ *
+ * @mxml
+ *
+ * <p>The <code><mx:Text></code> tag inherits all of the tag attributes
+ * of its superclass, and adds the following tag attributes:</p>
+ *
+ * <pre>
+ * <mx:Text
+ * leading="2"
+ * />
+ * </pre>
+ *
+ * @includeExample examples/TextExample.mxml
+ *
+ * @see mx.controls.Label
+ * @see mx.controls.TextInput
+ * @see mx.controls.TextArea
+ * @see mx.controls.RichTextEditor
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Flex 3
+ */
+public class Text extends Label
+{
+ //--------------------------------------------------------------------------
+ //
+ // Implementation notes
+ //
+ //--------------------------------------------------------------------------
+
+ /*
+ Like any component, a Text component's width can be determined
+ by an explicitWidth, a percentWidth, or a measuredWidth,
+ and similarly for its height.
+
+ Therefore there are nine measurement/layout cases.
+ Eight of them are easily handled by the standard LayoutManager
+ sequence of calling measure() and then updateDisplayList().
+
+ However, when a percentage width but no height is specified,
+ the situation is more complicated.
+ The problem is that in measure() we need to compute the measuredHeight
+ by wordwrapping the text within some appropriate width, but we don't
+ know what that width (some percentage of the parent's available width)
+ is until updateDisplayList() has passed it as unscaledWidth.
+
+ The same problem occurs when left and right constraints are specified
+ (and therefore the actual width depends on the parent's width)
+ but we need to compute a measuredHeight.
+
+ Therefore in these two cases we have to make a second measurement/layout
+ pass by calling invalidateSize() and invalidateDisplayList()
+ inside updateDisplayList(), which will cause measure() and
+ updateDisplayList() to be called a second time.
+
+ */
+
+ //--------------------------------------------------------------------------
+ //
+ // Constructor
+ //
+ //--------------------------------------------------------------------------
+
+ /**
+ * Constructor.
+ *
+ * @langversion 3.0
+ * @playerversion Flash 9
+ * @playerversion AIR 1.1
+ * @productversion Flex 3
+ */
+ public function Text()
+ {
+ super();
+ typeNames = "Text";
+
+// selectable = true;
+// truncateToFit = false;
+//
+// addEventListener(FlexEvent.UPDATE_COMPLETE, updateCompleteHandler);
+ }
+
+ //--------------------------------------------------------------------------
+ //
+ // Variables
+ //
+ //--------------------------------------------------------------------------
+
+ /**
+ * @private
+ */
+// private var lastUnscaledWidth:Number = NaN;
+
+ /**
+ * @private
+ */
+// private var widthChanged:Boolean = true;
+
+ //--------------------------------------------------------------------------
+ //
+ // Overridden properties
+ //
+ //--------------------------------------------------------------------------
+
+ //----------------------------------
+ // explicitWidth
+ //----------------------------------
+
+ /**
+ * @private
+ */
+// override public function set explicitWidth(value:Number):void
+// {
+// // Due to player bugs relating to scaling text, we
+// // have to be careful to set wordWrap appropriately
+// // (which we do in commitProperties).
+// // Also have to re-measure when width changes, because width
+// // can affect height.
+// if (value != explicitWidth)
+// {
+// widthChanged = true;
+// invalidateProperties();
+// invalidateSize();
+// }
+//
+// super.explicitWidth = value;
+// }
+
+ //----------------------------------
+ // maxWidth
+ //----------------------------------
+
+ /**
+ * @private
+ */
+// override public function set maxWidth(value:Number):void
+// {
+// // Due to player bugs relating to scaling text, we
+// // have to be careful to set wordWrap appropriately
+// // (which we do in commitProperties).
+// // Also have to re-measure when maxWidth changes, because maxWidth
+// // can affect height.
+// if (value != maxWidth)
+// {
+// widthChanged = true;
+// invalidateProperties();
+// invalidateSize();
+// }
+//
+// super.maxWidth = value;
+// }
+
+ //----------------------------------
+ // percentWidth
+ //----------------------------------
+
+ /**
+ * @private
+ */
+// override public function set percentWidth(value:Number):void
+// {
+// // Due to player bugs relating to scaling text, we
+// // have to be careful to set wordWrap appropriately
+// // (which we do in commitProperties).
+// // Also have to re-measure when width changes, because width
+// // can affect height.
+// if (value != percentWidth)
+// {
+// widthChanged = true;
+// invalidateProperties();
+// invalidateSize();
+// }
+//
+// super.percentWidth = value;
+// }
+
+ //--------------------------------------------------------------------------
+ //
+ // Overridden methods
+ //
+ //--------------------------------------------------------------------------
+
+ /**
+ * @royaleignorecoercion org.apache.royale.core.WrappedHTMLElement
+ */
+ COMPILE::JS
+ override protected function createElement():WrappedHTMLElement
+ {
+ super.createElement();
+
+ element.style.whiteSpace = "normal";
+
+ return element;
+ }
+
+ /**
+ * @private
+ */
+// override protected function childrenCreated():void
+// {
+// super.childrenCreated();
+//
+// textField.wordWrap = true;
+// textField.multiline = true;
+// textField.mouseWheelEnabled = false;
+//
+// }
+
+ /**
+ * @private
+ */
+// override protected function commitProperties():void
+// {
+// super.commitProperties();
+//
+// // If explicitWidth or maxWidth or percentWidth changed,
+// // set wordWrap appropriately before measuring.
+// if (widthChanged)
+// {
+// textField.wordWrap = !isNaN(explicitWidth) ||
+// !isNaN(explicitMaxWidth) ||
+// !isNaN(percentWidth);
+// widthChanged = false;
+// }
+// }
+
+ /**
+ * @private
+ *
+ * If the Text component has an explicit width or maximum width,
+ * its text wordwraps within that width,
+ * and the measured height is tall enough to display all the text.
+ * (If there is an explicit height or a percent height in this case,
+ * the text may get clipped.)
+ *
+ * If it doesn't have an explicit height,
+ * the measured height is tall enough to display all the text.
+ * If there is an explicit height or a percent height,
+ * the text may get clipped.
+ *
+ * If the Text doesn't have an explicit or maximum width,
+ * the measured width is based on explicit line breaks
+ * (e.g, \n, <br>, etc.).
+ * For example, if the text is
+ *
+ * The question of the day is:
+ * What is the right algorithm for Text?
+ *
+ * with a line break between the two lines, then the measured width
+ * will be wide enough to see all of the second line,
+ * and the measured height will be tall enough for two lines.
+ *
+ * For lengthy text without explicit line breaks,
+ * this will produce unusably wide layout.
+ */
+// override protected function measure():void
+// {
+// if (isSpecialCase())
+// {
+// if (!isNaN(lastUnscaledWidth))
+// {
+// measureUsingWidth(lastUnscaledWidth);
+// }
+// else
+// {
+// // We're not ready to measure yet.
+// // We need updateDisplayList() to first tell us
+// // the unscaledWidth that has been calculated
+// // from the percentWidth.
+// measuredWidth = 0;
+// measuredHeight = 0;
+// }
+// return;
+// }
+//
+// // Figure out the width we're going to use;
+// // explicitWidth trumps explicitMaxWidth.
+// var availableWidth:Number;
+//
+// if (!isNaN(explicitWidth))
+// availableWidth = explicitWidth;
+// else if (!isNaN(explicitMaxWidth))
+// availableWidth = explicitMaxWidth;
+//
+// measureUsingWidth(availableWidth);
+// }
+
+ /**
+ * @private
+ */
+// override protected function updateDisplayList(unscaledWidth:Number,
+// unscaledHeight:Number):void
+// {
+// // Don't call super.updateDisplayList();
+// // Text has a different layout algorithm than Label.
+// if (isSpecialCase())
+// {
+// var firstTime:Boolean = isNaN(lastUnscaledWidth) ||
+// lastUnscaledWidth != unscaledWidth;
+// lastUnscaledWidth = unscaledWidth;
+// if (firstTime)
+// {
+// invalidateSize();
+// return;
+// }
+// }
+//
+// // The textField occupies the entire Text bounds minus the padding.
+// var paddingLeft:Number = getStyle("paddingLeft");
+// var paddingTop:Number = getStyle("paddingTop");
+// var paddingRight:Number = getStyle("paddingRight");
+// var paddingBottom:Number = getStyle("paddingBottom");
+// textField.setActualSize(unscaledWidth - paddingLeft - paddingRight,
+// unscaledHeight - paddingTop - paddingBottom);
+//
+// textField.x = paddingLeft;
+// textField.y = paddingTop;
+//
+// // Although we also set wordWrap in commitProperties(), we do
+// // this here to handle width being set through setActualSize().
+// if (Math.floor(width) < Math.floor(measuredWidth))
+// textField.wordWrap = true;
+// }
+
+ //--------------------------------------------------------------------------
+ //
+ // Methods
+ //
+ //--------------------------------------------------------------------------
+
+ /**
+ * @private
+ * The cases that requires a second pass through the LayoutManager
+ * are <mx:Text width="N%"/> (the control is to use the percentWidth
+ * but the measuredHeight) and <mx:Text left="N" right="N"/>
+ * (the control is to use the parent's width minus the constraints
+ * but the measuredHeight).
+ */
+// private function isSpecialCase():Boolean
+// {
+// var left:Number = getStyle("left");
+// var right:Number = getStyle("right");
+//
+// return (!isNaN(percentWidth) || (!isNaN(left) && !isNaN(right))) &&
+// isNaN(explicitHeight) &&
+// isNaN(percentHeight);
+// }
+
+ /**
+ * @private
+ */
+// private function measureUsingWidth(w:Number):void
+// {
+// /*
+// var t:String = isHTML ? explicitHTMLText : text;
+//
+// // If the text is null, empty, or a single character,
+// // make the measured size big enough to hold
+// // a capital and decending character using the current font.
+// if (!t || t.length < 2)
+// t = "Wj";
+// */
+//
+// // Don't call super.measure();
+// // Text has a different measurement algorithm than Label.
+//
+// var paddingLeft:Number = getStyle("paddingLeft");
+// var paddingTop:Number = getStyle("paddingTop");
+// var paddingRight:Number = getStyle("paddingRight");
+// var paddingBottom:Number = getStyle("paddingBottom");
+//
+// // Ensure that the proper CSS styles get applied
+// // to the textField before measuring text.
+// // Otherwise the callLater(validateNow) in UITextField's
+// // styleChanged() method can apply the CSS styles too late.
+// textField.validateNow();
+//
+// textField.autoSize = "left";
+//
+// // If we know what width to use for word wrapping,
+// // determine the height by wordwrapping to that width.
+// if (!isNaN(w))
+// {
+// textField.width = w - paddingLeft - paddingRight;
+//
+// measuredWidth = Math.ceil(textField.textWidth) +
+// UITextField.TEXT_WIDTH_PADDING;
+// measuredHeight = Math.ceil(textField.textHeight) +
+// UITextField.TEXT_HEIGHT_PADDING;
+// // Round up because embedded fonts can produce fractional values;
+// // if a parent container rounds a component's actual width or height
+// // down, the component may not be wide enough to display the text.
+// }
+//
+// // If we don't know what width to use for word wrapping,
+// // determine the measured width and height
+// // from the explicit line breaks such as "\n" and "<br>".
+// else
+// {
+// var oldWordWrap:Boolean = textField.wordWrap;
+// textField.wordWrap = false;
+//
+// measuredWidth = Math.ceil(textField.textWidth) +
+// UITextField.TEXT_WIDTH_PADDING;
+// measuredHeight = Math.ceil(textField.textHeight) +
+// UITextField.TEXT_HEIGHT_PADDING;
+// // Round up because embedded fonts can produce fractional values;
+// // if a parent container rounds a component's actual width or height
+// // down, the component may not be wide enough to display the text.
+//
+// textField.wordWrap = oldWordWrap;
+// }
+//
+// textField.autoSize = "none";
+//
+// // Add in the padding.
+// measuredWidth += paddingLeft + paddingRight;
+// measuredHeight += paddingTop + paddingBottom;
+//
+// if (isNaN(explicitWidth))
+// {
+// // it could be any size
+// measuredMinWidth = DEFAULT_MEASURED_MIN_WIDTH;
+// measuredMinHeight = DEFAULT_MEASURED_MIN_HEIGHT;
+// }
+// else
+// {
+// // lock in the content area
+// measuredMinWidth = measuredWidth;
+// measuredMinHeight = measuredHeight;
+// }
+//
+// }
+
+ //--------------------------------------------------------------------------
+ //
+ // Event handlers
+ //
+ //--------------------------------------------------------------------------
+
+ /**
+ * @private
+ */
+// private function updateCompleteHandler(event:FlexEvent):void
+// {
+// lastUnscaledWidth = NaN;
+// }
+}
+
+}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/TextArea.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/TextArea.as
index 9164d6d..e7c6d92 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/TextArea.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/TextArea.as
@@ -49,7 +49,6 @@ import mx.events.FlexEvent;
import org.apache.royale.core.ITextModel;
import org.apache.royale.events.Event;
-import org.apache.royale.html.accessories.PasswordInputBead;
/*
import mx.events.ScrollEvent;
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
index 606fe31..72ad4ad 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -53,6 +53,7 @@ import org.apache.royale.events.Event;
import org.apache.royale.events.KeyboardEvent;
import org.apache.royale.geom.Point;
import org.apache.royale.geom.Rectangle;
+import org.apache.royale.html.accessories.ToolTipBead;
/*
import mx.managers.IToolTipManagerClient;
@@ -1911,6 +1912,8 @@ public class UIComponent extends UIBase
* Storage for the toolTip property.
*/
private var _toolTip:String;
+
+ private var _toolTipBead: ToolTipBead;
[Bindable("toolTipChanged")]
[Inspectable(category="General", defaultValue="null")]
@@ -1938,9 +1941,18 @@ public class UIComponent extends UIBase
var oldValue:String = _toolTip;
_toolTip = value;
- // TODO
- if (GOOG::DEBUG)
- trace("toolTip not implemented");
+ if (_toolTip != null && _toolTip != "" && _toolTipBead == null) {
+ _toolTipBead = new ToolTipBead();
+ addBead(_toolTipBead);
+ }
+ else if ((_toolTip == null || _toolTip == "") && _toolTipBead != null) {
+ removeBead(_toolTipBead);
+ _toolTipBead = null;
+ }
+
+ if (_toolTipBead) {
+ _toolTipBead.toolTip = _toolTip;
+ }
dispatchEvent(new Event("toolTipChanged"));
}
--
To stop receiving notification emails like this one, please contact
pent@apache.org.