asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

draw button focus before text and icon

Browse source 
closes #2047
This commit is contained in:
Juan Linietsky 2015-06-08 10:36:11 -03:00
parent 7590f3db21
commit c76900beb8
3 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -280,4 +280,4 @@ cscope.files
cscope.out cscope.out
cscope.in.out cscope.in.out
cscope.po.out cscope.po.out
godot.creator.user.wd3476 godot.creator.*

6
platform/windows/detect.py
View file

@ -201,6 +201,12 @@ def configure(env):
env.Append(CCFLAGS=['/O2','/DDEBUG_ENABLED']) env.Append(CCFLAGS=['/O2','/DDEBUG_ENABLED'])
env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE']) env.Append(LINKFLAGS=['/SUBSYSTEM:CONSOLE'])
elif (env["target"]=="debug_release"):
env.Append(CCFLAGS=['/Zi','/Od'])
env.Append(LINKFLAGS=['/DEBUG'])
env.Append(LINKFLAGS=['/SUBSYSTEM:WINDOWS'])
env.Append(LINKFLAGS=['/ENTRY:mainCRTStartup'])
elif (env["target"]=="debug"): elif (env["target"]=="debug"):

11
scene/gui/button.cpp
View file

@ -97,6 +97,13 @@ void Button::_notification(int p_what) {
} break; } break;
} }
if (has_focus()) {
Ref<StyleBox> style = get_stylebox("focus");
style->draw(ci,Rect2(Point2(),size));
}
Ref<StyleBox> style = get_stylebox("normal" ); Ref<StyleBox> style = get_stylebox("normal" );
Ref<Font> font=get_font("font"); Ref<Font> font=get_font("font");
Ref<Texture> _icon; Ref<Texture> _icon;
@ -134,11 +141,7 @@ void Button::_notification(int p_what) {
_icon->draw(ci,Point2(style->get_offset().x, Math::floor( (size.height-_icon->get_height())/2.0 ) ),is_disabled()?Color(1,1,1,0.4):Color(1,1,1) ); _icon->draw(ci,Point2(style->get_offset().x, Math::floor( (size.height-_icon->get_height())/2.0 ) ),is_disabled()?Color(1,1,1,0.4):Color(1,1,1) );
} }
if (has_focus()) {
Ref<StyleBox> style = get_stylebox("focus");
style->draw(ci,Rect2(Point2(),size));
}
} }
} }