From 01f82d6725fb4c0b8dea143b5b695d0150f5b911 Mon Sep 17 00:00:00 2001
From: Vadim Lopatin <buggins@fromru.com>
Date: Fri, 22 Apr 2016 14:46:15 +0300
Subject: [PATCH] support animation status on Android platform

---
 src/dlangui/platforms/android/androidapp.d | 23 ++++++++++++++++------
 src/dlangui/platforms/common/platform.d    | 11 +++++++++--
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/src/dlangui/platforms/android/androidapp.d b/src/dlangui/platforms/android/androidapp.d
index 61ce76cf..d0e0f538 100644
--- a/src/dlangui/platforms/android/androidapp.d
+++ b/src/dlangui/platforms/android/androidapp.d
@@ -301,7 +301,7 @@ class AndroidPlatform : Platform {
 			}
 			eglTerminate(_display);
 		}
-		_engine.animating = 0;
+		//_engine.animating = 0;
 		_display = EGL_NO_DISPLAY;
 		_context = EGL_NO_CONTEXT;
 		_surface = EGL_NO_SURFACE;
@@ -317,7 +317,9 @@ class AndroidPlatform : Platform {
 			return 0;
 		return w.handle_input(event);
 	}
-	
+
+
+	bool _appFocused;
 	/**
 	 * Process the next main command.
 	 */
@@ -349,13 +351,15 @@ class AndroidPlatform : Platform {
 			case APP_CMD_GAINED_FOCUS:
 				Log.d("APP_CMD_GAINED_FOCUS");
 				// When our app gains focus
+				_appFocused = true;
 				break;
 			case APP_CMD_LOST_FOCUS:
 				Log.d("APP_CMD_LOST_FOCUS");
 				// When our app loses focus
 				// This is to avoid consuming battery while not being used.
 				// Also stop animating.
-				_engine.animating = 0;
+				//_engine.animating = 0;
+				_appFocused = false;
 				drawWindow();
 				break;
 			case APP_CMD_INPUT_CHANGED:
@@ -399,6 +403,13 @@ class AndroidPlatform : Platform {
 		}
 	}
 
+	@property bool isAnimationActive() {
+		auto w = activeWindow;
+		return (w && w.isAnimationActive && _appFocused);
+	}
+	
+
+
 	void sendRedrawEvent(AndroidWindow w, uint redrawEventCode) {
 		import core.stdc.stdio;
 		import core.sys.posix.unistd;
@@ -505,7 +516,7 @@ class AndroidPlatform : Platform {
 			// If not animating, we will block forever waiting for events.
 			// If animating, we loop until all events are read, then continue
 			// to draw the next frame of animation.
-			while ((ident=ALooper_pollAll(_engine.animating ? 0 : -1, null, &events,
+			while ((ident=ALooper_pollAll(isAnimationActive ? 0 : -1, null, &events,
 						cast(void**)&source)) >= 0) {
 				
 				// Process this event.
@@ -535,7 +546,7 @@ class AndroidPlatform : Platform {
 				}
 			}
 			
-			if (_engine.animating) {
+			if (isAnimationActive) {
 				// Done with events; draw next animation frame.
 				_engine.state.angle += .01f;
 				if (_engine.state.angle > 1) {
@@ -586,7 +597,7 @@ struct saved_state {
  * Shared state for our app.
  */
 struct engine {
-    int animating;
+    //int animating;
     saved_state state;
 }
 
diff --git a/src/dlangui/platforms/common/platform.d b/src/dlangui/platforms/common/platform.d
index d2ea9173..9a61a1ff 100644
--- a/src/dlangui/platforms/common/platform.d
+++ b/src/dlangui/platforms/common/platform.d
@@ -1048,14 +1048,21 @@ class Window : CustomEventTarget {
             checkUpdateNeeded(_tooltip.popup, needDraw, needLayout, animationActive);
         return needDraw || needLayout || animationActive;
     }
+
+    protected bool _animationActive;
+
+    @property bool isAnimationActive() {
+        return _animationActive;
+    }
+
     /// requests update for window (unless force is true, update will be performed only if layout, redraw or animation is required).
     void update(bool force = false) {
         if (_mainWidget is null)
             return;
         bool needDraw = false;
         bool needLayout = false;
-        bool animationActive = false;
-        if (checkUpdateNeeded(needDraw, needLayout, animationActive) || force) {
+        _animationActive = false;
+        if (checkUpdateNeeded(needDraw, needLayout, _animationActive) || force) {
             debug(DebugRedraw) Log.d("Requesting update");
             invalidate();
         }