diff options
| author | toger5 <toger5@hotmail.de> | 2017-06-24 19:09:28 -0700 |
|---|---|---|
| committer | toger5 <toger5@hotmail.de> | 2017-08-15 19:49:24 +0200 |
| commit | 015494ba56fc393b9e83a51dca76979eecc3d3c2 (patch) | |
| tree | 02fe611bee01ed245c7c8e59cdc50227cffb07f3 | |
| parent | d637cbb289ea6a7f915113c22447100ed00279eb (diff) | |
new StyleBoxFlat removed multiBorderColor
- removed only the bindings because the drawing code is not done yet
- kept c++ functions for setting individual border color for future implementation
| -rw-r--r-- | scene/resources/style_box.cpp | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/scene/resources/style_box.cpp b/scene/resources/style_box.cpp index 765e9f7be7..68dba9a98a 100644 --- a/scene/resources/style_box.cpp +++ b/scene/resources/style_box.cpp @@ -704,10 +704,11 @@ void StyleBoxFlat::_bind_methods() { ClassDB::bind_method(D_METHOD("set_bg_color", "color"), &StyleBoxFlat::set_bg_color); ClassDB::bind_method(D_METHOD("get_bg_color"), &StyleBoxFlat::get_bg_color); - ClassDB::bind_method(D_METHOD("set_border_color_all", "color"), &StyleBoxFlat::set_border_color_all); + ClassDB::bind_method(D_METHOD("set_border_color", "color"), &StyleBoxFlat::set_border_color_all); + ClassDB::bind_method(D_METHOD("get_border_color", "color"), &StyleBoxFlat::get_light_color); - ClassDB::bind_method(D_METHOD("set_border_color", "margin", "color"), &StyleBoxFlat::set_border_color); - ClassDB::bind_method(D_METHOD("get_border_color", "margin"), &StyleBoxFlat::get_border_color); + // ClassDB::bind_method(D_METHOD("set_border_color", "margin", "color"), &StyleBoxFlat::set_border_color); + // ClassDB::bind_method(D_METHOD("get_border_color", "margin"), &StyleBoxFlat::get_border_color); ClassDB::bind_method(D_METHOD("set_light_color", "color"), &StyleBoxFlat::set_light_color); ClassDB::bind_method(D_METHOD("get_light_color"), &StyleBoxFlat::get_light_color); @@ -761,11 +762,11 @@ void StyleBoxFlat::_bind_methods() { ADD_PROPERTYI(PropertyInfo(Variant::INT, "border_width_right", PROPERTY_HINT_RANGE, "0,1024,1"), "set_border_width", "get_border_width", MARGIN_RIGHT); ADD_PROPERTYI(PropertyInfo(Variant::INT, "border_width_bottom", PROPERTY_HINT_RANGE, "0,1024,1"), "set_border_width", "get_border_width", MARGIN_BOTTOM); - ADD_GROUP("Border Color", "border_color_"); - ADD_PROPERTYI(PropertyInfo(Variant::COLOR, "border_color_left"), "set_border_color", "get_border_color", MARGIN_LEFT); - ADD_PROPERTYI(PropertyInfo(Variant::COLOR, "border_color_top"), "set_border_color", "get_border_color", MARGIN_TOP); - ADD_PROPERTYI(PropertyInfo(Variant::COLOR, "border_color_right"), "set_border_color", "get_border_color", MARGIN_RIGHT); - ADD_PROPERTYI(PropertyInfo(Variant::COLOR, "border_color_bottom"), "set_border_color", "get_border_color", MARGIN_BOTTOM); + ADD_GROUP("Border", "border_"); + ADD_PROPERTY(PropertyInfo(Variant::COLOR, "border_color"), "set_border_color", "get_border_color"); + // ADD_PROPERTYI(PropertyInfo(Variant::COLOR, "border_color_top"), "set_border_color", "get_border_color", MARGIN_TOP); + // ADD_PROPERTYI(PropertyInfo(Variant::COLOR, "border_color_right"), "set_border_color", "get_border_color", MARGIN_RIGHT); + // ADD_PROPERTYI(PropertyInfo(Variant::COLOR, "border_color_bottom"), "set_border_color", "get_border_color", MARGIN_BOTTOM); ADD_PROPERTY(PropertyInfo(Variant::BOOL, "border_blend"), "set_border_blend", "get_border_blend"); |