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

-make animationplayer thinner, also toolbuttons too. fixes #3526

Browse source
This commit is contained in:
Juan Linietsky 2016-02-02 18:21:13 -03:00
parent d2f2eed963
commit 857edbea1c
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
scene/resources/default_theme/default_theme.cpp
View file

@ -264,8 +264,8 @@ void make_default_theme() {
// ToolButton // ToolButton
Ref<StyleBox> tb_empty = memnew( StyleBoxEmpty ); Ref<StyleBox> tb_empty = memnew( StyleBoxEmpty );
tb_empty->set_default_margin(MARGIN_LEFT,8); tb_empty->set_default_margin(MARGIN_LEFT,6);
tb_empty->set_default_margin(MARGIN_RIGHT,8); tb_empty->set_default_margin(MARGIN_RIGHT,6);
tb_empty->set_default_margin(MARGIN_TOP,4); tb_empty->set_default_margin(MARGIN_TOP,4);
tb_empty->set_default_margin(MARGIN_BOTTOM,4); tb_empty->set_default_margin(MARGIN_BOTTOM,4);

2
tools/editor/plugins/animation_player_editor_plugin.cpp
View file

@ -1298,7 +1298,7 @@ AnimationPlayerEditor::AnimationPlayerEditor(EditorNode *p_editor) {
frame = memnew( SpinBox ); frame = memnew( SpinBox );
hb->add_child(frame); hb->add_child(frame);
frame->set_custom_minimum_size(Size2(80,0)); frame->set_custom_minimum_size(Size2(60,0));
frame->set_stretch_ratio(2); frame->set_stretch_ratio(2);
frame->set_tooltip("Animation position (in seconds)."); frame->set_tooltip("Animation position (in seconds).");

2
tools/editor/project_settings.cpp
View file

@ -846,7 +846,7 @@ void ProjectSettings::_autoload_edited() {
undo_redo->create_action("Toggle Autoload GlobalVar"); undo_redo->create_action("Toggle Autoload GlobalVar");
undo_redo->add_do_property(Globals::get_singleton(),base,path); undo_redo->add_do_property(Globals::get_singleton(),base,path);
undo_redo->add_undo_property(Globals::get_singleton(),base,Globals::get_singleton()->get(base)); undo_redo->add_undo_property(Globals::get_singleton(),base,Globals::get_singleton()->get(base));
undo_redo->add_do_method(Globals::get_singleton(),"set_order",base,order); undo_redo->add_do_method(Globals::get_singleton(),"set_order",base,order); // keep order, as config order matters for these
undo_redo->add_undo_method(Globals::get_singleton(),"set_order",base,order); undo_redo->add_undo_method(Globals::get_singleton(),"set_order",base,order);
undo_redo->add_do_method(this,"_update_autoload"); undo_redo->add_do_method(this,"_update_autoload");
undo_redo->add_undo_method(this,"_update_autoload"); undo_redo->add_undo_method(this,"_update_autoload");