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

Merge pull request #14455 from RayKoopa/remove_layer_flyout_label 

Remove physics / render layer flyout label.
This commit is contained in:
Rémi Verschelde 2017-12-09 19:03:23 +01:00 committed by GitHub
parent 8a4cec21ca cae50c7f1d
commit 45f7fc46f8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
editor/property_editor.cpp
View File

@ -430,24 +430,19 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::
} else if (hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || hint == PROPERTY_HINT_LAYERS_2D_RENDER || hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || hint == PROPERTY_HINT_LAYERS_3D_RENDER) { } else if (hint == PROPERTY_HINT_LAYERS_2D_PHYSICS || hint == PROPERTY_HINT_LAYERS_2D_RENDER || hint == PROPERTY_HINT_LAYERS_3D_PHYSICS || hint == PROPERTY_HINT_LAYERS_3D_RENDER) {
String title;
String basename; String basename;
switch (hint) { switch (hint) {
case PROPERTY_HINT_LAYERS_2D_RENDER: case PROPERTY_HINT_LAYERS_2D_RENDER:
basename = "layer_names/2d_render"; basename = "layer_names/2d_render";
title = "2D Render Layers";
break; break;
case PROPERTY_HINT_LAYERS_2D_PHYSICS: case PROPERTY_HINT_LAYERS_2D_PHYSICS:
basename = "layer_names/2d_physics"; basename = "layer_names/2d_physics";
title = "2D Physics Layers";
break; break;
case PROPERTY_HINT_LAYERS_3D_RENDER: case PROPERTY_HINT_LAYERS_3D_RENDER:
basename = "layer_names/3d_render"; basename = "layer_names/3d_render";
title = "3D Render Layers";
break; break;
case PROPERTY_HINT_LAYERS_3D_PHYSICS: case PROPERTY_HINT_LAYERS_3D_PHYSICS:
basename = "layer_names/3d_physics"; basename = "layer_names/3d_physics";
title = "3D Physics Layers";
break; break;
} }
@ -469,11 +464,7 @@ bool CustomPropertyEditor::edit(Object *p_owner, const String &p_name, Variant::
show(); show();
value_label[0]->set_text(title); checks20gc->set_position(Vector2(4, 4) * EDSCALE);
value_label[0]->show();
value_label[0]->set_position(Vector2(4, 4) * EDSCALE);
checks20gc->set_position(Vector2(4, 4) * EDSCALE + Vector2(0, value_label[0]->get_size().height + 4 * EDSCALE));
checks20gc->set_size(checks20gc->get_minimum_size()); checks20gc->set_size(checks20gc->get_minimum_size());
set_size(Vector2(4, 4) * EDSCALE + checks20gc->get_position() + checks20gc->get_size()); set_size(Vector2(4, 4) * EDSCALE + checks20gc->get_position() + checks20gc->get_size());