Revert "[[ Bug 17247 ]] Include dirty rect of children in dirty rect of group"

livecodeian · livecodeian · commit 1a9069cf70f6 · 2016-09-26T10:05:46.000+01:00
This reverts commit 4d94321.
diff --git a/docs/notes/bugfix-17247.md b/docs/notes/bugfix-17247.md
diff --git a/engine/src/group.cpp b/engine/src/group.cpp
@@ -3101,22 +3101,3 @@ void MCGroup::scheduledelete(bool p_is_child)
 		while(t_control != controls);
 	}
 }
-
-MCRectangle MCGroup::geteffectiverect(void) const
-{
-    MCRectangle t_rect;
-    t_rect = MCControl::geteffectiverect();
-    
-    if (controls != NULL)
-    {
-        MCControl *t_control;
-        t_control = controls;
-        do
-        {   t_rect = MCU_union_rect(t_rect, t_control -> geteffectiverect());
-            t_control = t_control -> next();
-        }
-        while(t_control != controls);
-    }
-    
-    return t_rect;
-}
diff --git a/engine/src/group.h b/engine/src/group.h
@@ -148,11 +148,6 @@ class MCGroup : public MCControl
     
     virtual bool isdeletable(bool p_check_flag);
     
-    // This call computes the pixel bounds of the group, rather than
-    // just its active bounds - transients, bitmap effects and selection
-    // handles of a group's children may extend beyond the group's bounds.
-    virtual MCRectangle geteffectiverect(void) const;
-    
     void drawselectedchildren(MCDC *dc);
     bool updatechildselectedrect(MCRectangle& x_rect);
     
diff --git a/engine/src/redraw.cpp b/engine/src/redraw.cpp
@@ -555,8 +555,12 @@ void MCControl::layer_dirtyeffectiverect(const MCRectangle& p_effective_rect, bo
 			return;
 		}
 		
-		// Otherwise intersect the dirty rect with the parent's effective rect.
-		t_dirty_rect = MCU_intersect_rect(t_dirty_rect, t_parent_control -> geteffectiverect());
+		// Otherwise intersect the dirty rect with the parent's rect.
+		t_dirty_rect = MCU_intersect_rect(t_dirty_rect, t_control -> parent -> getrect());
+
+		// Expand due to bitmap effects (if any).
+		if (t_parent_control -> m_bitmap_effects != nil)
+			MCBitmapEffectsComputeBounds(t_parent_control -> m_bitmap_effects, t_dirty_rect, t_dirty_rect);
 
 		t_control = t_parent_control;
 	}

Original file line number	Diff line number	Diff line change
`@@ -555,8 +555,12 @@ void MCControl::layer_dirtyeffectiverect(const MCRectangle& p_effective_rect, bo`
`555`	`555`	`return;`
`556`	`556`	`}`
`557`	`557`
`558`		`- // Otherwise intersect the dirty rect with the parent's effective rect.`
`559`		`- t_dirty_rect = MCU_intersect_rect(t_dirty_rect, t_parent_control -> geteffectiverect());`
	`558`	`+ // Otherwise intersect the dirty rect with the parent's rect.`
	`559`	`+ t_dirty_rect = MCU_intersect_rect(t_dirty_rect, t_control -> parent -> getrect());`
	`560`	`+`
	`561`	`+ // Expand due to bitmap effects (if any).`
	`562`	`+ if (t_parent_control -> m_bitmap_effects != nil)`
	`563`	`+ MCBitmapEffectsComputeBounds(t_parent_control -> m_bitmap_effects, t_dirty_rect, t_dirty_rect);`
`560`	`564`
`561`	`565`	`t_control = t_parent_control;`
`562`	`566`	`}`