From 6344949f577812a15439b090186c09778aee3b0a Mon Sep 17 00:00:00 2001 From: Joshua Granick Date: Thu, 20 Aug 2015 23:44:29 -0700 Subject: [PATCH] Make application.renderer and .window return the first value from the array again --- lime/app/Application.hx | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/lime/app/Application.hx b/lime/app/Application.hx index 702b5d409..f86b523cc 100644 --- a/lime/app/Application.hx +++ b/lime/app/Application.hx @@ -33,9 +33,9 @@ class Application extends Module { */ public var onUpdate = new EventVoid> (); - public var renderer (default, null):Renderer; + public var renderer (get, null):Renderer; public var renderers (default, null):Array; - public var window (default, null):Window; + public var window (get, null):Window; public var windows (default, null):Array; @:noCompletion private var backend:ApplicationBackend; @@ -109,7 +109,6 @@ class Application extends Module { renderer.onContextRestored.add (onRenderContextRestored.bind (renderer)); renderers.push (renderer); - this.renderer = renderer; } @@ -167,8 +166,6 @@ class Application extends Module { */ public function createWindow (window:Window):Void { - this.window = window; - window.onActivate.add (onWindowActivate.bind (window)); window.onClose.add (onWindowClose.bind (window)); window.onCreate.add (onWindowCreate.bind (window)); @@ -739,6 +736,20 @@ class Application extends Module { } + @:noCompletion private inline function get_renderer ():Renderer { + + return renderers[0]; + + } + + + @:noCompletion private inline function get_window ():Window { + + return windows[0]; + + } + + }