diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2017-01-08 18:39:14 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2017-01-08 19:12:24 -0300 |
| commit | de73297883712962571c69e960e893ed12ee3854 (patch) | |
| tree | af8bf2f37d11c15332c6e1874c5e1fb4f858c7cc | |
| parent | 719b2e6eaaaea68b22a166fdf394bb0e2430c2d0 (diff) | |
Swapped expand and fill flag bits, so scenes don't save this property by default
| -rw-r--r-- | scene/gui/control.cpp | 4 | ||||
| -rw-r--r-- | scene/gui/control.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scene/gui/control.cpp b/scene/gui/control.cpp index abfe11dba0..8018b845da 100644 --- a/scene/gui/control.cpp +++ b/scene/gui/control.cpp @@ -2589,8 +2589,8 @@ void Control::_bind_methods() { ADD_PROPERTYINZ( PropertyInfo(Variant::NODE_PATH,"focus_neighbour_bottom" ), _SCS("set_focus_neighbour"),_SCS("get_focus_neighbour"),MARGIN_BOTTOM ); ADD_GROUP("Size Flags","size_flags_"); - ADD_PROPERTY( PropertyInfo(Variant::INT,"size_flags_horizontal", PROPERTY_HINT_FLAGS, "Expand,Fill"), _SCS("set_h_size_flags"),_SCS("get_h_size_flags") ); - ADD_PROPERTY( PropertyInfo(Variant::INT,"size_flags_vertical", PROPERTY_HINT_FLAGS, "Expand,Fill"), _SCS("set_v_size_flags"),_SCS("get_v_size_flags") ); + ADD_PROPERTYNO( PropertyInfo(Variant::INT,"size_flags_horizontal", PROPERTY_HINT_FLAGS, "Fill,Expand"), _SCS("set_h_size_flags"),_SCS("get_h_size_flags") ); + ADD_PROPERTYNO( PropertyInfo(Variant::INT,"size_flags_vertical", PROPERTY_HINT_FLAGS, "Fill,Expand"), _SCS("set_v_size_flags"),_SCS("get_v_size_flags") ); ADD_PROPERTYNO( PropertyInfo(Variant::INT,"size_flags_stretch_ratio", PROPERTY_HINT_RANGE, "1,128,0.01"), _SCS("set_stretch_ratio"),_SCS("get_stretch_ratio") ); ADD_GROUP("Theme",""); ADD_PROPERTYNZ( PropertyInfo(Variant::OBJECT,"theme", PROPERTY_HINT_RESOURCE_TYPE, "Theme"), _SCS("set_theme"),_SCS("get_theme") ); diff --git a/scene/gui/control.h b/scene/gui/control.h index 7295c393a5..2da004c583 100644 --- a/scene/gui/control.h +++ b/scene/gui/control.h @@ -66,8 +66,8 @@ public: enum SizeFlags { - SIZE_EXPAND=1, - SIZE_FILL=2, + SIZE_FILL=1, + SIZE_EXPAND=2, SIZE_EXPAND_FILL=SIZE_EXPAND|SIZE_FILL }; |