Browse Source

Revert "Respect style boxes for Button states other than "normal""

This reverts commit 98f01f914333eb5e70174c4adf4a5f910a38d645.
This made icons in the editor "jumpy" on hover.
Rémi Verschelde 8 năm trước cách đây
mục cha
commit
d8ae244d51
1 tập tin đã thay đổi với 5 bổ sung10 xóa
  1. 5 10
      scene/gui/button.cpp

+ 5 - 10
scene/gui/button.cpp

@@ -65,21 +65,17 @@ void Button::_notification(int p_what) {
 
 		//print_line(get_text()+": "+itos(is_flat())+" hover "+itos(get_draw_mode()));
 
-		Ref<StyleBox> style = get_stylebox("normal");
-
 		switch (get_draw_mode()) {
 
 			case DRAW_NORMAL: {
 
-				style = get_stylebox("normal");
 				if (!flat)
-					style->draw(ci, Rect2(Point2(0, 0), size));
+					get_stylebox("normal")->draw(ci, Rect2(Point2(0, 0), size));
 				color = get_color("font_color");
 			} break;
 			case DRAW_PRESSED: {
 
-				style = get_stylebox("pressed");
-				style->draw(ci, Rect2(Point2(0, 0), size));
+				get_stylebox("pressed")->draw(ci, Rect2(Point2(0, 0), size));
 				if (has_color("font_color_pressed"))
 					color = get_color("font_color_pressed");
 				else
@@ -88,15 +84,13 @@ void Button::_notification(int p_what) {
 			} break;
 			case DRAW_HOVER: {
 
-				style = get_stylebox("hover");
-				style->draw(ci, Rect2(Point2(0, 0), size));
+				get_stylebox("hover")->draw(ci, Rect2(Point2(0, 0), size));
 				color = get_color("font_color_hover");
 
 			} break;
 			case DRAW_DISABLED: {
 
-				style = get_stylebox("disabled");
-				style->draw(ci, Rect2(Point2(0, 0), size));
+				get_stylebox("disabled")->draw(ci, Rect2(Point2(0, 0), size));
 				color = get_color("font_color_disabled");
 
 			} break;
@@ -108,6 +102,7 @@ void Button::_notification(int p_what) {
 			style->draw(ci, Rect2(Point2(), size));
 		}
 
+		Ref<StyleBox> style = get_stylebox("normal");
 		Ref<Font> font = get_font("font");
 		Ref<Texture> _icon;
 		if (icon.is_null() && has_icon("icon"))