You are viewing a plain text version of this content. The canonical link for it is here.
Posted to issues@royale.apache.org by GitBox <gi...@apache.org> on 2018/08/15 06:15:42 UTC
[GitHub] pashminakazi closed pull request #270: new changes in files
pashminakazi closed pull request #270: new changes in files
URL: https://github.com/apache/royale-asjs/pull/270
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
index 68dd27b7b..aa52cf6ab 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/listClasses/AdvancedListBase.as
@@ -3262,6 +3262,14 @@ public class AdvancedListBase extends UIComponent /* extends ScrollControlBase
dispatchEvent(new Event("wordWrapChanged")); */
}
+ public function get verticalAlign():String
+ {
+ return "middle";
+ }
+ public function set verticalAlign(value:String):void
+ {
+ }
+
//--------------------------------------------------------------------------
//
// Overridden methods: UIComponent
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/events/KeyboardEvent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/events/KeyboardEvent.as
index 6247eb6d0..1539d67ef 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/events/KeyboardEvent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/events/KeyboardEvent.as
@@ -47,6 +47,28 @@ public class KeyboardEvent extends flash.events.KeyboardEvent
{
super(type, bubbles, cancelable,charCodeValue,keyCodeValue,keyLocationValue,ctrlKeyValue,altKeyValue,shiftKeyValue,controlKeyValue,commandKeyValue);
}
+
+ public static const KEY_DOWN:String = platformConstant1("keyDown");
+
+ private static function platformConstant(s:uint):uint
+ {
+ return s;
+ }
+ private static function platformConstant1(s:String):String
+ {
+ return s;
+ }
+
+
+ public function get KEY_DOWN():String
+ {
+ return "keyDown";
+ }
+ public function set KEY_DOWN(val:String):void
+ {
+ }
+
+
}
/**
@@ -71,14 +93,14 @@ public class KeyboardEvent extends org.apache.royale.events.KeyboardEvent
public function set keyCode(val:uint):void
{
}
- /*public function get KEY_DOWN():String
+ public function get KEY_DOWN():String
{
return "keyDown";
}
public function set KEY_DOWN(val:String):void
{
- }*/
+ }
private static function platformConstant(s:uint):uint
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/FocusManager.as b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/FocusManager.as
index a5b6e109c..1245edbd9 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/FocusManager.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/FocusManager.as
@@ -2370,6 +2370,40 @@ public class FocusManager extends EventDispatcher implements IFocusManager
{
return null;
}
+ public function setFocus(o:IFocusManagerComponent):void
+ {
+ // trace("FM " + this + " setting focus to " + o);
+
+ o.setFocus();
+
+ if (hasEventListener("setFocus"))
+ dispatchEvent(new Event("setFocus"));
+ // trace("FM set focus");
+ }
+
+ private var _getFocus:IFocusManagerComponent;
+ public function getFocus():IFocusManagerComponent
+ {
+ return _getFocus;
+ //var stage:Stage = Sprite(form)./*systemManager.*/stage;
+
+ /* if (!stage)
+ return null;
+
+ var o:InteractiveObject = stage.focus;
+
+ // If a Stage* object (such as StageText or StageWebView) has focus,
+ // stage.focus will be set to null. Much of the focus framework is not
+ // set up to handle this. So, if stage.focus is null, we return the last
+ // IFocusManagerComponent that had focus. In ADL, focus works slightly
+ // different than it does on device when using StageText. In ADL, when
+ // the focus is a StageText component, a TextField whose parent is the
+ // stage is assigned focus.
+ if ((!o && _lastFocus) || (o is TextField && o.parent == stage))
+ return _lastFocus;
+
+ return findFocusManagerComponent(o); */
+ }
}
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/IFocusManager.as b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/IFocusManager.as
index 88f5bd6af..2712d85a1 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/IFocusManager.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/IFocusManager.as
@@ -42,13 +42,15 @@ public interface IFocusManager extends IEventDispatcher
//
//--------------------------------------------------------------------------
-
+
//--------------------------------------------------------------------------
//
// Methods
//
//--------------------------------------------------------------------------
function getNextFocusManagerComponent(backward:Boolean = false):IFocusManagerComponent;
+ function setFocus(o:IFocusManagerComponent):void;
+ function getFocus():IFocusManagerComponent;
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/ISystemManager.as b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/ISystemManager.as
index bbb68e884..12881e18f 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/ISystemManager.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/ISystemManager.as
@@ -79,7 +79,9 @@ public interface ISystemManager extends IEventDispatcher, IChildList /*, IFlexMo
// Properties
//
//--------------------------------------------------------------------------
-
+function get numModalWindows():int
+function set numModalWindows(value:int):void
+function get rawChildren():IChildList
//----------------------------------
// component
//----------------------------------
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/SystemManager.as b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/SystemManager.as
index dfc2d2aee..45f787f3f 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/managers/SystemManager.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/managers/SystemManager.as
@@ -98,7 +98,7 @@ import mx.core.IFlexDisplayObject;
import mx.core.IUIComponent;
import org.apache.royale.core.IUIBase;
-import org.apache.royale.events.IEventDispatcher;
+import org.apache.royale.events.IEventDispatcher;
//--------------------------------------
// Events
@@ -1114,7 +1114,7 @@ public class SystemManager extends SystemManagerBase implements ISystemManager,
* @private
* Storage for the numModalWindows property.
*/
- // private var _numModalWindows:int = 0;
+ private var _numModalWindows:int = 0;
/**
* The number of modal windows. Modal windows don't allow
@@ -1127,18 +1127,18 @@ public class SystemManager extends SystemManagerBase implements ISystemManager,
* @playerversion AIR 1.1
* @productversion Royale 0.9.4
*/
- /* public function get numModalWindows():int
+ public function get numModalWindows():int
{
return _numModalWindows;
- } */
+ }
/**
* @private
*/
- /* public function set numModalWindows(value:int):void
+ public function set numModalWindows(value:int):void
{
_numModalWindows = value;
- } */
+ }
//----------------------------------
// preloadedRSLs
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
With regards,
Apache Git Services