[[ Bug 12495 ]] Fix windowshape rendering and update issues.

runrevmark · runrevmark · commit 5a9eaccf6173 · 2014-06-11T14:13:48.000+01:00
diff --git a/docs/notes/bugfix-12495.md b/docs/notes/bugfix-12495.md
@@ -0,0 +1 @@
+[[ Bug 12495 ]] Animating windowShape does not work properly on Mac.
diff --git a/engine/src/desktop-stack.cpp b/engine/src/desktop-stack.cpp
@@ -323,6 +323,15 @@ void MCStack::view_platform_updatewindowwithcallback(MCRegionRef p_region, MCSta
 
 ////////////////////////////////////////////////////////////////////////////////
 
+// MW-2014-06-11: [[ Bug 12495 ]] Update windowshape by setting window property.
+void MCStack::updatewindowshape(MCWindowShape *p_shape)
+{
+    destroywindowshape();
+    m_window_shape = p_shape;
+    MCPlatformSetWindowProperty(window, kMCPlatformWindowPropertyMask, kMCPlatformPropertyTypeWindowMask, (MCPlatformWindowMaskRef *)&m_window_shape -> handle);
+    dirtyall();
+}
+
 void MCStack::destroywindowshape(void)
 {
 	if (m_window_shape == nil)
diff --git a/engine/src/mac-window.mm b/engine/src/mac-window.mm
@@ -1792,6 +1792,9 @@ - (void)setFrameSize: (NSSize)size
 	if (m_changes . opacity_changed)
 		[m_window_handle setAlphaValue: m_opacity];
 	
+    if (m_changes . has_shadow_changed)
+        [m_window_handle setHasShadow: m_has_shadow];
+    
 	if (m_changes . mask_changed)
 	{
 		[m_window_handle setOpaque: m_mask == nil];
@@ -1931,7 +1934,7 @@ - (void)setFrameSize: (NSSize)size
 {	
 	// If the shadow has changed (due to the mask changing) we must disable
 	// screen updates otherwise we get a flicker.
-	if (m_shadow_changed)
+	if (m_shadow_changed && m_has_shadow)
 		NSDisableScreenUpdates();
 	
 	// Mark the bounding box of the dirty region for needing display.
@@ -1943,8 +1946,13 @@ - (void)setFrameSize: (NSSize)size
 	[m_view displayIfNeeded];
 	
 	// Re-enable screen updates if needed.
-	if (m_shadow_changed)
+	if (m_shadow_changed && m_has_shadow)
+    {
+        // MW-2014-06-11: [[ Bug 12495 ]] Turn the shadow off and on to force recaching.
+        [m_window_handle setHasShadow: NO];
+        [m_window_handle setHasShadow: YES];
 		NSEnableScreenUpdates();
+    }
 }
 
 void MCMacPlatformWindow::DoIconify(void)
diff --git a/engine/src/stack.cpp b/engine/src/stack.cpp
@@ -2493,14 +2493,10 @@ Exec_stat MCStack::setprop(uint4 parid, Properties which, MCExecPoint &ep, Boole
 						t_image -> open();
 						t_new_mask = t_image -> makewindowshape();
 						t_image -> close();
+                        // MW-2014-06-11: [[ Bug 12495 ]] Refactored action as different whether using platform API or not.
 						if (t_new_mask != NULL)
-						{
-							destroywindowshape();
-							m_window_shape = t_new_mask;
-							// MW-2011-08-17: [[ Redraw ]] Tell the stack to dirty all of itself.
-							dirtyall();
-							break;
-						}
+                            updatewindowshape(t_new_mask);
+                        break;
 					}
 				}
 #endif
@@ -3086,6 +3082,17 @@ bool MCStack::getuseideallayout(void)
 #endif
 }
 
+#ifndef _MAC_DESKTOP
+// MW-2014-06-11: [[ Bug 12495 ]] Non-platform API version of updating windowshape.
+void MCStack::updatewindowshape(MCWindowShape *p_shape)
+{
+    destroywindowshape();
+    m_window_shape = p_shape;
+    // MW-2011-08-17: [[ Redraw ]] Tell the stack to dirty all of itself.
+    dirtyall();
+}
+#endif
+
 //////////
 
 MCRectangle MCStack::getwindowrect(void) const
diff --git a/engine/src/stack.h b/engine/src/stack.h
@@ -495,7 +495,7 @@ class MCStack : public MCObject
 	MCRectangle getcardrect() const;
 	// IM-2014-01-07: [[ StackScale ]] Update the rect of the current card to fit the stack
 	void updatecardsize();
-	
+    
 	//////////
 	
 	void setgeom();
@@ -759,7 +759,9 @@ class MCStack : public MCObject
 	void sethints();
 	// IM-2013-10-08: [[ FullscreenMode ]] Separate out window sizing hints
 	void setsizehints();
+    
 	void destroywindowshape();
+    void updatewindowshape(MCWindowShape *shape);
 
 	// MW-2011-08-17: [[ Redraw ]] Mark the whole content area as needing redrawn.
 	void dirtyall(void);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+[[ Bug 12495 ]] Animating windowShape does not work properly on Mac.`