@@ -88,6 +88,7 @@ package org.openPyro.aurora.skinClasses } label.text = bttn.label; + label.embedFonts = _embedFonts; } } @@ -100,5 +101,15 @@ package org.openPyro.aurora.skinClasses } } + protected var _embedFonts:Boolean; + public function set embedFonts(_val:Boolean):void { + _embedFonts = _val; + if(label) + label.embedFonts = _val; + } + + public function get embedFonts():Boolean { + return _embedFonts; + } } -} \ No newline at end of file +} src/org/openPyro/aurora/skinClasses/AbstractButtonSkin.as @@ -9,6 +9,7 @@ package org.openPyro.controls public class Label extends UIControl { protected var _textField:TextField; + protected var _embedFonts:Boolean; public function Label() { @@ -31,6 +32,7 @@ package org.openPyro.controls protected function setTextFieldProperties():void{ _textField.selectable = false; //_textField.border = true; + _textField.embedFonts = _embedFonts; } /** @@ -85,6 +87,17 @@ package org.openPyro.controls public function get text():String{ return _text; } + + public function get embedFonts():Boolean { + return _embedFonts; + } + + public function set embedFonts(_val:Boolean):void { + _embedFonts = _val; + if(_textField){ + _textField.embedFonts = _val; + } + } override protected function doChildBasedValidation():void { @@ -136,4 +149,4 @@ package org.openPyro.controls } } -} \ No newline at end of file +} src/org/openPyro/controls/Label.as @@ -268,24 +268,27 @@ package org.openPyro.controls protected function handleRendererClick(event:MouseEvent):void { - // dont react if the click is coming from a currently - // selected child. - if(!(event.currentTarget is IListDataRenderer) || IListDataRenderer(event.currentTarget).selected) return; + /* + // dont react if the click is coming from a currently + // selected child. + if(!(event.currentTarget is IListDataRenderer) || IListDataRenderer(event.currentTarget).selected) return; + */ + if(!(event.currentTarget is IListDataRenderer)) return; - if(selectedRenderer && selectedRenderer is IListDataRenderer){ - IListDataRenderer(selectedRenderer).selected = false; - } + if(selectedRenderer && selectedRenderer is IListDataRenderer){ + IListDataRenderer(selectedRenderer).selected = false; + } - var newIndex:int = itemRendererToIndex(event.currentTarget as DisplayObject); - if(newIndex != selectedIndex){ - selectedIndex = newIndex; - selectedRenderer = event.currentTarget as DisplayObject; - if(selectedRenderer is IListDataRenderer){ - IListDataRenderer(selectedRenderer).selected = true; - } - } - - dispatchEvent(new ListEvent(ListEvent.ITEM_CLICK)); + var newIndex:int = itemRendererToIndex(event.currentTarget as DisplayObject); + if(newIndex != selectedIndex){ + selectedIndex = newIndex; + selectedRenderer = event.currentTarget as DisplayObject; + if(selectedRenderer is IListDataRenderer){ + IListDataRenderer(selectedRenderer).selected = true; + } + } + + dispatchEvent(new ListEvent(ListEvent.ITEM_CLICK)); } src/org/openPyro/controls/List.as @@ -128,4 +128,4 @@ package org.openPyro.controls.listClasses } } -} \ No newline at end of file +} src/org/openPyro/controls/listClasses/DefaultListRenderer.as @@ -786,4 +786,4 @@ package org.openPyro.core{ this.contentPane.scrollRect = rect } } -} \ No newline at end of file +} src/org/openPyro/core/UIContainer.as 6f9bff0a5b60df4b97220b16297574e350e8971b Ezio Trevisano eziotic@gmail.com http://github.com/geekrelief/openpyro/commit/a5a9d8c047ef8b96129762609c551f3db53b2af9 a5a9d8c047ef8b96129762609c551f3db53b2af9 2009-06-12T20:56:34-07:00 2009-06-12T20:56:34-07:00 added embedFonts property for Label and aurora's AbstractButtonSkin, changed List to allow for repeated item click events 89239e82ba56880421a1be0bf5529f73fdef71fe Ezio Trevisano eziotic@gmail.com