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

Make buttons properly obey stylebox content marins, closes #2156

Browse source
This commit is contained in:
Juan Linietsky 2016-01-02 15:51:41 -03:00
parent be73e2d2f2
commit b0b1da6950
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/gui/button.cpp
View file

@ -137,8 +137,10 @@ void Button::_notification(int p_what) {
text_ofs.y+=font->get_ascent(); text_ofs.y+=font->get_ascent();
font->draw( ci, text_ofs.floor(), text, color,clip_text?text_clip:-1); font->draw( ci, text_ofs.floor(), text, color,clip_text?text_clip:-1);
if (!_icon.is_null()) { if (!_icon.is_null()) {
int valign = size.height-style->get_minimum_size().y;
_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,style->get_offset()+Point2(0, Math::floor( (valign-_icon->get_height())/2.0 ) ),is_disabled()?Color(1,1,1,0.4):Color(1,1,1) );
} }

1
tools/editor/code_editor.cpp
View file

@ -612,6 +612,7 @@ CodeTextEditor::CodeTextEditor() {
if (!font_overrode) if (!font_overrode)
text_editor->add_font_override("font",get_font("source","Fonts")); text_editor->add_font_override("font",get_font("source","Fonts"));
text_editor->set_show_line_numbers(true); text_editor->set_show_line_numbers(true);
text_editor->set_brace_matching(true); text_editor->set_brace_matching(true);
text_editor->set_auto_indent(true); text_editor->set_auto_indent(true);

1
tools/editor/plugins/path_2d_editor_plugin.cpp
View file

@ -534,6 +534,7 @@ void Path2DEditor::edit(Node *p_path2d) {
if (!node->is_connected("visibility_changed", this, "_node_visibility_changed")) if (!node->is_connected("visibility_changed", this, "_node_visibility_changed"))
node->connect("visibility_changed", this, "_node_visibility_changed"); node->connect("visibility_changed", this, "_node_visibility_changed");
} else { } else {
if (canvas_item_editor->get_viewport_control()->is_connected("draw",this,"_canvas_draw")) if (canvas_item_editor->get_viewport_control()->is_connected("draw",this,"_canvas_draw"))