[[ Bug 17117 ]] Set clip rect to content rect before drawing icon

livecodeali · livecodeali · commit 6b7103df9652 · 2016-03-14T17:20:11.000Z
diff --git a/docs/notes/bugfix-17117.md b/docs/notes/bugfix-17117.md
@@ -0,0 +1 @@
+# Clip content correctly when control selected
diff --git a/engine/src/buttondraw.cpp b/engine/src/buttondraw.cpp
@@ -443,6 +443,13 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
                 sy = centery - (nlines * fheight / 2) + fleading/2 + fascent;
                 theight = nlines * fheight;
             }
+            
+            coord_t starty = sy;
+            uint2 i;
+            coord_t twidth = 0;
+            
+            dc->save();
+            dc->cliprect(t_content_rect);
 
             // MW-2014-06-19: [[ IconGravity ]] Use old method of calculating icon location if gravity is none.
 			if (flags & F_SHOW_ICON && icons != NULL && icons->curicon != NULL && m_icon_gravity == kMCGravityNone)
@@ -470,13 +477,6 @@ void MCButton::draw(MCDC *dc, const MCRectangle& p_dirty, bool p_isolated, bool
 				icons->curicon->drawcentered(dc, centerx + loff, centery + loff, (state & CS_HILITED) != 0);
 				icondrawed = True;
 			}
-
-			coord_t starty = sy;
-			uint2 i;
-			coord_t twidth = 0;
-			
-			dc->save();
-			dc->cliprect(t_content_rect);
 			
 			uindex_t t_totallen = 0;
 			for (i = 0 ; i < nlines ; i++)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# Clip content correctly when control selected`