[[ Bug 17247 ]] Make sure selection handles are invalidated when object rect changes.

livecodeian · livecodeian · commit c490158dc40b · 2016-09-26T17:21:47.000+01:00
diff --git a/docs/notes/bugfix-17247.md b/docs/notes/bugfix-17247.md
@@ -0,0 +1 @@
+# Remove selection artefacts when handles are drawn outside of parent group rect
diff --git a/engine/src/card.cpp b/engine/src/card.cpp
@@ -3030,6 +3030,20 @@ void MCCard::drawselectedchildren(MCDC *dc)
     while (tptr != objptrs);
 }
 
+void MCCard::dirtyselection(const MCRectangle &p_rect)
+{
+	// redraw marquee rect
+	// selrect with 0 width or height will still draw a 1px line, so increase rect size to account for this.
+	layer_dirtyrect(MCU_reduce_rect(p_rect, -1));
+	
+	// redraw selection handles
+	MCRectangle t_handles[8];
+	MCControl::sizerects(p_rect, t_handles);
+
+	for (uint32_t i = 0; i < 8; i++)
+		layer_dirtyrect(t_handles[i]);
+}
+
 bool MCCard::updatechildselectedrect(MCRectangle& x_rect)
 {
     bool t_updated;
diff --git a/engine/src/card.h b/engine/src/card.h
@@ -215,6 +215,11 @@ class MCCard : public MCObject
 	// IM-2013-09-13: [[ RefactorGraphics ]] render the card selection rect
 	void drawselectionrect(MCContext *);
     void drawselectedchildren(MCDC *dc);
+	
+	// IM-2016-09-26: [[ Bug 17247 ]] request redraw of the area occupied by
+	//      selection marquee + handles
+	void dirtyselection(const MCRectangle &p_rect);
+	
     bool updatechildselectedrect(MCRectangle& x_rect);
     
 	Exec_stat openbackgrounds(bool p_is_preopen, MCCard *p_other);
diff --git a/engine/src/control.cpp b/engine/src/control.cpp
@@ -433,6 +433,8 @@ void MCControl::select()
 
 	// MW-2011-08-18: [[ Layers ]] Invalidate the whole object.
 	layer_redrawall();
+	
+	getcard()->dirtyselection(rect);
 }
 
 void MCControl::deselect()
@@ -446,6 +448,8 @@ void MCControl::deselect()
 		// MW-2011-08-18: [[ Layers ]] Invalidate the whole object.
 		layer_redrawall();
         
+		getcard()->dirtyselection(rect);
+
         state &= ~(CS_SELECTED | CS_MOVE | CS_SIZE | CS_CREATE);
 	}
 }
@@ -790,30 +794,30 @@ void MCControl::redraw(MCDC *dc, const MCRectangle &dirty)
 	}
 }
 
-void MCControl::sizerects(MCRectangle *rects)
+void MCControl::sizerects(const MCRectangle &p_object_rect, MCRectangle r_rects[8])
 {
 	int2 x[3];
 	int2 y[3];
 
 	uint2 handlesize = MCsizewidth;
-    
-    x[0] = rect.x - (handlesize >> 1);
- 	x[1] = rect.x + ((rect.width - handlesize) >> 1);
-    x[2] = rect.x + rect.width - (handlesize >> 1);
-    y[0] = rect.y - (handlesize >> 1);
- 	y[1] = rect.y + ((rect.height - handlesize) >> 1);
-    y[2] = rect.y + rect.height - (handlesize >> 1);
 
+	x[0] = p_object_rect.x - (handlesize >> 1);
+	x[1] = p_object_rect.x + ((p_object_rect.width - handlesize) >> 1);
+	x[2] = p_object_rect.x + p_object_rect.width - (handlesize >> 1);
+	y[0] = p_object_rect.y - (handlesize >> 1);
+	y[1] = p_object_rect.y + ((p_object_rect.height - handlesize) >> 1);
+	y[2] = p_object_rect.y + p_object_rect.height - (handlesize >> 1);
+	
 	uint2 i;
 	uint2 j;
 	uint2 k = 0;
 	for (i = 0 ; i < 3 ; i++)
 		for (j = 0 ; j < 3 ; j++)
 			if (i != 1 || j != 1)
 			{
-				rects[k].width = rects[k].height = handlesize;
-				rects[k].x = x[j];
-				rects[k].y = y[i];
+				r_rects[k].width = r_rects[k].height = handlesize;
+				r_rects[k].x = x[j];
+				r_rects[k].y = y[i];
 				k++;
 			}
 }
@@ -833,7 +837,7 @@ void MCControl::drawselected(MCDC *dc)
     drawmarquee(dc, rect);
     
     MCRectangle rects[8];
-    sizerects(rects);
+    sizerects(rect, rects);
     if (flags & F_LOCK_LOCATION)
         dc->setfillstyle(FillStippled, nil, 0, 0);
     else
@@ -1173,7 +1177,7 @@ uint2 MCControl::sizehandles(int2 px, int2 py)
 	if (!(flags & F_LOCK_LOCATION))
 	{
 		MCRectangle rects[8];
-		sizerects(rects);
+		sizerects(rect, rects);
 		int2 i;
 		for (i = 7 ; i >= 0 ; i--)
         {
@@ -1719,9 +1723,6 @@ MCRectangle MCControl::geteffectiverect(void) const
 	MCRectangle t_rect;
 	t_rect = MCU_reduce_rect(rect, -gettransient());
 
-    if (state & CS_SELECTED)
-        t_rect = MCU_reduce_rect(t_rect, -MCsizewidth);
-    
 	if (m_bitmap_effects != nil)
 		MCBitmapEffectsComputeBounds(m_bitmap_effects, t_rect, t_rect);
 
diff --git a/engine/src/mccontrol.h b/engine/src/mccontrol.h
@@ -156,7 +156,9 @@ class MCControl : public MCObject
 
 	void redraw(MCDC *dc, const MCRectangle &dirty);
 
-	void sizerects(MCRectangle *rects);
+	// IM-2016-09-26: [[ Bug 17247 ]] Return rect of selection handles for the given object rect
+	static void sizerects(const MCRectangle &p_object_rect, MCRectangle rects[8]);
+	
 	void drawselected(MCDC *dc);
 	void drawarrow(MCDC *dc, int2 x, int2 y, uint2 size,
 	               Arrow_direction dir, Boolean border, Boolean hilite);
diff --git a/engine/src/redraw.cpp b/engine/src/redraw.cpp
@@ -358,6 +358,10 @@ void MCControl::layer_setrect(const MCRectangle& p_new_rect, bool p_redraw_all)
 		return;
 	}
 
+	// IM-2016-09-26: [[ Bug 17247 ]] dirty old selection rect
+	if (getselected())
+		getcard()->dirtyselection(rect);
+	
 	MCRectangle t_old_effectiverect;
 	t_old_effectiverect = geteffectiverect();
 
@@ -369,6 +373,10 @@ void MCControl::layer_setrect(const MCRectangle& p_new_rect, bool p_redraw_all)
 		
 	setrect(p_new_rect);
 
+	// IM-2016-09-26: [[ Bug 17247 ]] dirty new selection rect
+	if (getselected())
+		getcard()->dirtyselection(rect);
+
 	layer_changeeffectiverect(t_old_effectiverect, p_redraw_all, t_is_visible);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Remove selection artefacts when handles are drawn outside of parent group rect`