Merge remote-tracking branch 'origin/develop-7.0' into develop

livecodesebastien · livecodesebastien · commit 522284064994 · 2015-11-10T15:41:32.000Z
Clean merge, apart from the files listed in 'Conflicts'

Conflicts:
	engine/src/stackview.cpp
diff --git a/docs/notes/bugfix-16368.md b/docs/notes/bugfix-16368.md
@@ -0,0 +1 @@
+#   Hiding a mobile player does not automatically hide the controller on Android
diff --git a/docs/notes/bugfix-16391.md b/docs/notes/bugfix-16391.md
@@ -0,0 +1 @@
+# Going to a card forces a stack onscreen
diff --git a/engine/src/java/com/runrev/android/nativecontrol/ExtVideoView.java b/engine/src/java/com/runrev/android/nativecontrol/ExtVideoView.java
@@ -308,6 +308,17 @@ else if (mFdWithOffset)
             return;
         }
     }
+	
+	// PM-2015-11-05: [[ Bug 16368 ]] Toggling the visibility of the android player should show/hide the controller (if any)
+	public void setControllerVisible(boolean p_visible)
+	{
+		if (mMediaController != null ){
+			if (p_visible)
+				mMediaController.show(0);
+			else
+				mMediaController.hide();
+		}
+	}
 
     public void setMediaController(MediaController controller) {
         if (mMediaController != null) {
diff --git a/engine/src/java/com/runrev/android/nativecontrol/VideoControl.java b/engine/src/java/com/runrev/android/nativecontrol/VideoControl.java
@@ -163,7 +163,15 @@ public void setShowController(boolean show)
         else
             m_video_view.setMediaController(null);
     }
-    
+	
+	// PM-2015-11-05: [[ Bug 16368 ]] Toggling the visibility of the android player should show/hide the controller (if any)
+	// Override setVisible() of NativeControl 
+	public void setVisible(boolean p_visible)
+	{
+		m_video_view.setControllerVisible(p_visible);
+		super.setVisible(p_visible);
+	}
+	
     public void setCurrentTime(int msec)
     {
         m_video_view.seekTo(msec);
diff --git a/engine/src/stack.h b/engine/src/stack.h
@@ -406,7 +406,7 @@ class MCStack : public MCObject
 	
 	// IM-2014-01-16: [[ StackScale ]] Ensure the view rect & transform are in sync with the configured view properties
 	// (stack viewport, fullscreen mode, fullscreen, scale factor)
-	void view_update_transform(void);
+	void view_update_transform(bool p_ensure_onscreen = false);
 	
 	// IM-2014-01-16: [[ StackScale ]] Calculate the new view rect, transform, and adjusted stack rect for the given stack rect
 	void view_calculate_viewports(const MCRectangle &p_stack_rect, MCRectangle &r_adjusted_stack_rect, MCRectangle &r_view_rect, MCGAffineTransform &r_transform);
diff --git a/engine/src/stackview.cpp b/engine/src/stackview.cpp
@@ -214,7 +214,7 @@ void MCStack::view_set_content_scale(MCGFloat p_scale)
 	m_view_content_scale = p_scale;
 	
 	// IM-2014-01-16: [[ StackScale ]] Update view transform after changing view property
-	view_update_transform();
+	view_update_transform(true);
 	// IM-2014-10-22: [[ Bug 13746 ]] Update window mask when stack scale changes
 	loadwindowshape();
 }
@@ -427,7 +427,7 @@ void MCStack::view_calculate_viewports(const MCRectangle &p_stack_rect, MCRectan
 	r_transform = MCGAffineTransformConcat(view_get_stack_transform(t_mode, MCGRectangleGetIntegerBounds(t_scaled_rect), t_view_rect), t_transform);
 }
 	
-void MCStack::view_update_transform(void)
+void MCStack::view_update_transform(bool p_ensure_onscreen)
 {
 	MCRectangle t_view_rect;
 	MCGAffineTransform t_transform;
@@ -452,21 +452,30 @@ void MCStack::view_update_transform(void)
 	}
 	
 	// PM-2015-07-17: [[ Bug 13754 ]] Make sure stack does not disappear off screen when changing the scalefactor
-    MCRectangle t_bounded_rect, t_screen_rect;
-
-    // AL-2015-10-01: [[ Bug 16017 ]] Remember location of stacks on a second monitor
-    const MCDisplay* t_nearest_display = MCscreen -> getnearestdisplay(t_view_rect);
-    if (t_nearest_display != NULL)
+    MCRectangle t_bounded_rect;
+    if (p_ensure_onscreen)
     {
-        t_screen_rect = t_nearest_display -> viewport;
-        t_bounded_rect = MCU_bound_rect(t_view_rect, t_screen_rect . x, t_screen_rect . y, t_screen_rect . width, t_screen_rect . height);
+        // AL-2015-10-01: [[ Bug 16017 ]] Remember location of stacks on a second monitor
+        const MCDisplay* t_nearest_display;
+        t_nearest_display = MCscreen -> getnearestdisplay(t_view_rect);
+        
+        if (t_nearest_display != nil)
+        {
+			MCRectangle t_screen_rect;
+            t_screen_rect = t_nearest_display -> viewport;
+            t_bounded_rect = MCU_bound_rect(t_view_rect, t_screen_rect . x, t_screen_rect . y, t_screen_rect . width, t_screen_rect . height);
+        }
+        else
+        {
+            // In noUI mode, we don't have a nearest display.
+            t_bounded_rect = MCU_bound_rect(t_view_rect, 0, 0, MCscreen -> getwidth(), MCscreen -> getheight());
+        }
     }
     else
     {
-        // In noUI mode, we don't have a nearest display.
-        t_bounded_rect = MCU_bound_rect(t_view_rect, 0, 0, MCscreen -> getwidth(), MCscreen -> getheight());
+        t_bounded_rect = t_view_rect;
     }
-	
+    
     // IM-2014-01-16: [[ StackScale ]] Update view rect if needed
     view_setrect(t_bounded_rect);
 }

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Hiding a mobile player does not automatically hide the controller on Android`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Going to a card forces a stack onscreen`