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

Merge pull request #10444 from toger5/styleBoxFlat_corner_detail_value_limitation

Browse source 
styleBoxFlat: clamp corner_detail + aa_size
This commit is contained in:
Rémi Verschelde 2017-08-19 17:56:48 +02:00 committed by GitHub
commit aef7a3178f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
scene/resources/style_box.cpp
View file

@ -463,7 +463,7 @@ bool StyleBoxFlat::is_anti_aliased() const {
} }
void StyleBoxFlat::set_aa_size(const int &p_aa_size) { void StyleBoxFlat::set_aa_size(const int &p_aa_size) {
aa_size = p_aa_size; aa_size = CLAMP(p_aa_size, 1, 5);
emit_changed(); emit_changed();
} }
int StyleBoxFlat::get_aa_size() const { int StyleBoxFlat::get_aa_size() const {
@ -471,7 +471,7 @@ int StyleBoxFlat::get_aa_size() const {
} }
void StyleBoxFlat::set_corner_detail(const int &p_corner_detail) { void StyleBoxFlat::set_corner_detail(const int &p_corner_detail) {
corner_detail = p_corner_detail; corner_detail = CLAMP(p_corner_detail, 1, 128);
emit_changed(); emit_changed();
} }
int StyleBoxFlat::get_corner_detail() const { int StyleBoxFlat::get_corner_detail() const {
@ -777,7 +777,7 @@ void StyleBoxFlat::_bind_methods() {
ADD_PROPERTYI(PropertyInfo(Variant::INT, "corner_radius_bottom_right", PROPERTY_HINT_RANGE, "0,1024,1"), "set_corner_radius", "get_corner_radius", CORNER_BOTTOM_RIGHT); ADD_PROPERTYI(PropertyInfo(Variant::INT, "corner_radius_bottom_right", PROPERTY_HINT_RANGE, "0,1024,1"), "set_corner_radius", "get_corner_radius", CORNER_BOTTOM_RIGHT);
ADD_PROPERTYI(PropertyInfo(Variant::INT, "corner_radius_bottom_left", PROPERTY_HINT_RANGE, "0,1024,1"), "set_corner_radius", "get_corner_radius", CORNER_BOTTOM_LEFT); ADD_PROPERTYI(PropertyInfo(Variant::INT, "corner_radius_bottom_left", PROPERTY_HINT_RANGE, "0,1024,1"), "set_corner_radius", "get_corner_radius", CORNER_BOTTOM_LEFT);
ADD_PROPERTY(PropertyInfo(Variant::INT, "corner_detail"), "set_corner_detail", "get_corner_detail"); ADD_PROPERTY(PropertyInfo(Variant::INT, "corner_detail", PROPERTY_HINT_RANGE, "1,128,1"), "set_corner_detail", "get_corner_detail");
ADD_GROUP("Expand Margin", "expand_margin_"); ADD_GROUP("Expand Margin", "expand_margin_");
ADD_PROPERTYI(PropertyInfo(Variant::REAL, "expand_margin_left", PROPERTY_HINT_RANGE, "0,2048,1"), "set_expand_margin", "get_expand_margin", MARGIN_LEFT); ADD_PROPERTYI(PropertyInfo(Variant::REAL, "expand_margin_left", PROPERTY_HINT_RANGE, "0,2048,1"), "set_expand_margin", "get_expand_margin", MARGIN_LEFT);