[[ Bug 16965 ]] Notify native layer of changes to view transform.

livecodeian · livecodeali · commit 08c92f669c2b · 2016-10-12T15:25:38.000+01:00
[[ Bug 16965 ]] Update native layer rect when view transform changes. (cherry picked from commit d72b7d5)
diff --git a/engine/src/card.cpp b/engine/src/card.cpp
@@ -1323,6 +1323,22 @@ void MCCard::toolchanged(Tool p_new_tool)
     }
 }
 
+void MCCard::OnViewTransformChanged()
+{
+	if (objptrs != nil)
+	{
+		MCObjptr *t_ptr = objptrs;
+		do
+		{
+			MCObject *t_obj = t_ptr->getref();
+			if (t_obj != nil)
+				t_obj->OnViewTransformChanged();
+			t_ptr = t_ptr->next();
+		}
+		while (t_ptr != objptrs);
+	}
+}
+
 void MCCard::OnAttach()
 {
 	if (objptrs != NULL)
diff --git a/engine/src/card.h b/engine/src/card.h
@@ -100,6 +100,8 @@ class MCCard : public MCObject
 	virtual void OnAttach();
 	virtual void OnDetach();
     
+	virtual void OnViewTransformChanged();
+	
 	// MW-2011-09-20: [[ Collision ]] Compute shape of card.
 	virtual bool lockshape(MCObjectShape& r_shape);
 	virtual void unlockshape(MCObjectShape& shape);
diff --git a/engine/src/group.cpp b/engine/src/group.cpp
@@ -283,6 +283,22 @@ void MCGroup::toolchanged(Tool p_new_tool)
 	}
 }
 
+void MCGroup::OnViewTransformChanged()
+{
+	MCControl::OnViewTransformChanged();
+	if (controls != nil)
+	{
+		MCControl *t_ctrl;
+		t_ctrl = controls;
+		do
+		{
+			t_ctrl->OnViewTransformChanged();
+			t_ctrl = t_ctrl->next();
+		}
+		while (t_ctrl != controls);
+	}
+}
+
 void MCGroup::OnAttach()
 {
 	MCControl::OnAttach();
diff --git a/engine/src/group.h b/engine/src/group.h
@@ -136,6 +136,8 @@ class MCGroup : public MCControl
 	virtual void OnAttach();
 	virtual void OnDetach();
 
+	virtual void OnViewTransformChanged();
+	
 	virtual void geometrychanged(const MCRectangle &p_rect);
 
 	virtual void viewportgeometrychanged(const MCRectangle &p_rect);
diff --git a/engine/src/native-layer.cpp b/engine/src/native-layer.cpp
@@ -85,6 +85,11 @@ bool MCNativeLayer::OnPaint(MCGContextRef p_context)
 	return doPaint(p_context);
 }
 
+void MCNativeLayer::OnViewTransformChanged()
+{
+	doSetGeometry(m_rect);
+}
+
 void MCNativeLayer::OnGeometryChanged(const MCRectangle &p_new_rect)
 {
 	if (!m_defer_geometry_changes)
diff --git a/engine/src/native-layer.h b/engine/src/native-layer.h
@@ -29,6 +29,7 @@ class MCNativeLayer
     virtual void OnDetach();
 	virtual bool OnPaint(MCGContextRef p_context);
     virtual void OnGeometryChanged(const MCRectangle& p_new_rect);
+	virtual void OnViewTransformChanged();
 	virtual void OnViewportGeometryChanged(const MCRectangle &p_rect);
     virtual void OnVisibilityChanged(bool p_visible);
     virtual void OnToolChanged(Tool p_new_tool);
diff --git a/engine/src/object.cpp b/engine/src/object.cpp
@@ -1232,6 +1232,12 @@ void MCObject::viewportgeometrychanged(const MCRectangle &p_rect)
 		getNativeLayer()->OnViewportGeometryChanged(p_rect);
 }
 
+void MCObject::OnViewTransformChanged()
+{
+	if (getNativeLayer() != nil)
+		getNativeLayer()->OnViewTransformChanged();
+}
+
 void MCObject::OnOpen()
 {
 	if (getNativeLayer() != nil)
diff --git a/engine/src/object.h b/engine/src/object.h
@@ -629,6 +629,9 @@ class MCObject : public MCDLlist
 	// IM-2016-01-19: [[ NativeWidgets ]] Informs the object that its visible area has changed.
 	virtual void viewportgeometrychanged(const MCRectangle &p_rect);
 	
+	// IM-2016-09-20: [[ Bug 16965 ]] Inform the object that the stack view transform has changed.
+	virtual void OnViewTransformChanged();
+	
 	// IM-2015-12-16: [[ NativeWidgets ]] Informs the object that it has been opened.
 	virtual void OnOpen();
 	// IM-2015-12-16: [[ NativeWidgets ]] Informs the object that it will be closed.
diff --git a/engine/src/stack.cpp b/engine/src/stack.cpp
@@ -1572,6 +1572,12 @@ void MCStack::toolchanged(Tool p_new_tool)
         curcard->toolchanged(p_new_tool);
 }
 
+void MCStack::OnViewTransformChanged()
+{
+	if (curcard != nil)
+		curcard->OnViewTransformChanged();
+}
+
 void MCStack::OnAttach()
 {
 	if (curcard != nil)
diff --git a/engine/src/stack.h b/engine/src/stack.h
@@ -361,6 +361,8 @@ class MCStack : public MCObject
 	
     virtual void toolchanged(Tool p_new_tool);
 	
+	virtual void OnViewTransformChanged();
+	
 	virtual void OnAttach();
 	virtual void OnDetach();
     
diff --git a/engine/src/stackview.cpp b/engine/src/stackview.cpp
@@ -444,12 +444,17 @@ void MCStack::view_update_transform(bool p_ensure_onscreen)
 	
 	// IM-2013-10-03: [[ FullscreenMode ]] if the transform has changed, redraw everything
 	// IM-2013-12-20: [[ ShowAll ]] if the stack viewport has changed, redraw everything
-	if (!MCU_equal_rect(t_stack_visible_rect, m_view_stack_visible_rect) || !MCGAffineTransformIsEqual(t_transform, m_view_transform))
+	bool t_rect_changed, t_transform_changed;
+	t_rect_changed = !MCU_equal_rect(t_stack_visible_rect, m_view_stack_visible_rect);
+	t_transform_changed = !MCGAffineTransformIsEqual(t_transform, m_view_transform);
+	if (t_rect_changed || t_transform_changed)
 	{
 		m_view_transform = t_transform;
 		m_view_stack_visible_rect = t_stack_visible_rect;
 		
 		view_dirty_all();
+		if (t_transform_changed)
+			this->OnViewTransformChanged();
 	}
 	
 	// PM-2015-07-17: [[ Bug 13754 ]] Make sure stack does not disappear off screen when changing the scalefactor

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,11 @@ bool MCNativeLayer::OnPaint(MCGContextRef p_context)`
`85`	`85`	`return doPaint(p_context);`
`86`	`86`	`}`
`87`	`87`
	`88`	`+void MCNativeLayer::OnViewTransformChanged()`
	`89`	`+{`
	`90`	`+ doSetGeometry(m_rect);`
	`91`	`+}`
	`92`	`+`
`88`	`93`	`void MCNativeLayer::OnGeometryChanged(const MCRectangle &p_new_rect)`
`89`	`94`	`{`
`90`	`95`	`if (!m_defer_geometry_changes)`
Original file line number	Diff line number	Diff line change
`@@ -1232,6 +1232,12 @@ void MCObject::viewportgeometrychanged(const MCRectangle &p_rect)`
`1232`	`1232`	`getNativeLayer()->OnViewportGeometryChanged(p_rect);`
`1233`	`1233`	`}`
`1234`	`1234`
	`1235`	`+void MCObject::OnViewTransformChanged()`
	`1236`	`+{`
	`1237`	`+ if (getNativeLayer() != nil)`
	`1238`	`+ getNativeLayer()->OnViewTransformChanged();`
	`1239`	`+}`
	`1240`	`+`
`1235`	`1241`	`void MCObject::OnOpen()`
`1236`	`1242`	`{`
`1237`	`1243`	`if (getNativeLayer() != nil)`
Original file line number	Diff line number	Diff line change
`@@ -1572,6 +1572,12 @@ void MCStack::toolchanged(Tool p_new_tool)`
`1572`	`1572`	`curcard->toolchanged(p_new_tool);`
`1573`	`1573`	`}`
`1574`	`1574`
	`1575`	`+void MCStack::OnViewTransformChanged()`
	`1576`	`+{`
	`1577`	`+ if (curcard != nil)`
	`1578`	`+ curcard->OnViewTransformChanged();`
	`1579`	`+}`
	`1580`	`+`
`1575`	`1581`	`void MCStack::OnAttach()`
`1576`	`1582`	`{`
`1577`	`1583`	`if (curcard != nil)`