kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make application.windows an Array again

Browse Source
This commit is contained in:
Joshua Granick
2015-08-20 10:32:15 -07:00
parent b44890502f
commit 04bbbcc180
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lime/_backend/native/NativeApplication.hx
View File

@@ -183,7 +183,7 @@ class NativeApplication {
private function handleKeyEvent ():Void {
var window = parent.windows.get (keyEventInfo.windowID);
var window = parent.windowByID.get (keyEventInfo.windowID);
if (window != null) {
@@ -206,7 +206,7 @@ class NativeApplication {
private function handleMouseEvent ():Void {
var window = parent.windows.get (mouseEventInfo.windowID);
var window = parent.windowByID.get (mouseEventInfo.windowID);
if (window != null) {
@@ -284,7 +284,7 @@ class NativeApplication {
private function handleTextEvent ():Void {
var window = parent.windows.get (textEventInfo.windowID);
var window = parent.windowByID.get (textEventInfo.windowID);
if (window != null) {
@@ -379,7 +379,7 @@ class NativeApplication {
private function handleWindowEvent ():Void {
var window = parent.windows.get (windowEventInfo.windowID);
var window = parent.windowByID.get (windowEventInfo.windowID);
if (window != null) {

15
lime/app/Application.hx
View File

@@ -36,10 +36,11 @@ class Application extends Module {
public var renderer (default, null):Renderer;
public var renderers (default, null):Array<Renderer>;
public var window (default, null):Window;
public var windows (default, null):Map<Int, Window>;
public var windows (default, null):Array<Window>;
@:noCompletion private var backend:ApplicationBackend;
@:noCompletion private var initialized:Bool;
@:noCompletion private var windowByID:Map<Int, Window>;
public function new () {
@@ -54,7 +55,9 @@ class Application extends Module {
modules = new Array ();
renderers = new Array ();
windows = new Map ();
windows = new Array ();
windowByID = new Map ();
backend = new ApplicationBackend (this);
onExit.add (onModuleExit);
@@ -151,7 +154,8 @@ class Application extends Module {
}
window.create (this);
windows.set (window.id, window);
windows.push (window);
windowByID.set (window.id, window);
}
@@ -650,9 +654,10 @@ class Application extends Module {
*/
public function removeWindow (window:Window):Void {
if (window != null && windows.exists (window.id)) {
if (window != null && windowByID.exists (window.id)) {
windows.remove (window.id);
windows.remove (window);
windowByID.remove (window.id);
window.close ();
}