Browse Source

Swapped expand and fill flag bits, so scenes don't save this property by default

Juan Linietsky 8 years ago
parent
commit
de73297883
2 changed files with 4 additions and 4 deletions
  1. 2 2
      scene/gui/control.cpp
  2. 2 2
      scene/gui/control.h

+ 2 - 2
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") );

+ 2 - 2
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
 
 	};