maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Respect style boxes for Button states other than "normal"

Browse source
This commit is contained in:
Ray Koopa 2017-01-21 23:00:59 +01:00
parent c4d6e54e93
commit 2baeb531e6
1 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
scene/gui/button.cpp
View file

@ -74,17 +74,21 @@ 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)
get_stylebox("normal" )->draw( ci, Rect2(Point2(0,0), size) );
style->draw( ci, Rect2(Point2(0,0), size) );
color=get_color("font_color");
} break;
case DRAW_PRESSED: {
get_stylebox("pressed" )->draw( ci, Rect2(Point2(0,0), size) );
style = get_stylebox("pressed");
style->draw( ci, Rect2(Point2(0,0), size) );
if (has_color("font_color_pressed"))
color=get_color("font_color_pressed");
else
@ -93,13 +97,15 @@ void Button::_notification(int p_what) {
} break;
case DRAW_HOVER: {
get_stylebox("hover" )->draw( ci, Rect2(Point2(0,0), size) );
style = get_stylebox("hover");
style->draw( ci, Rect2(Point2(0,0), size) );
color=get_color("font_color_hover");
} break;
case DRAW_DISABLED: {
get_stylebox("disabled" )->draw( ci, Rect2(Point2(0,0), size) );
style = get_stylebox("disabled");
style->draw( ci, Rect2(Point2(0,0), size) );
color=get_color("font_color_disabled");
} break;
@ -111,7 +117,6 @@ 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"))