godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 98f01f9143.
This made icons in the editor "jumpy" on hover.
This commit is contained in:
Rémi Verschelde 2017-04-11 19:45:39 +02:00
parent 8df5b7151f
commit d8ae244d51
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
scene/gui/button.cpp
View File

@ -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"))