Procházet zdrojové kódy

Merge pull request #14919 from groud/fix_grow_margin

Fixes Rect2 grow_margin not working at all
Gilles Roudiere před 7 roky
rodič
revize
59ec417e4a
1 změnil soubory, kde provedl 2 přidání a 1 odebrání
  1. 2 1
      core/math/math_2d.h

+ 2 - 1
core/math/math_2d.h

@@ -336,9 +336,10 @@ struct Rect2 {
 		g.size.height += p_by * 2;
 		g.size.height += p_by * 2;
 		return g;
 		return g;
 	}
 	}
+
 	inline Rect2 grow_margin(Margin p_margin, real_t p_amount) const {
 	inline Rect2 grow_margin(Margin p_margin, real_t p_amount) const {
 		Rect2 g = *this;
 		Rect2 g = *this;
-		g.grow_individual((MARGIN_LEFT == p_margin) ? p_amount : 0,
+		g = g.grow_individual((MARGIN_LEFT == p_margin) ? p_amount : 0,
 				(MARGIN_TOP == p_margin) ? p_amount : 0,
 				(MARGIN_TOP == p_margin) ? p_amount : 0,
 				(MARGIN_RIGHT == p_margin) ? p_amount : 0,
 				(MARGIN_RIGHT == p_margin) ? p_amount : 0,
 				(MARGIN_BOTTOM == p_margin) ? p_amount : 0);
 				(MARGIN_BOTTOM == p_margin) ? p_amount : 0);