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

Made a uniform distribution of characters in Label::set_percent_visible()

Browse source
This commit is contained in:
Theo Hallenius 2014-05-31 23:50:10 +02:00
parent 6f0b4678e2
commit 359ea6088c
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
scene/gui/label.cpp
View file

@ -398,12 +398,15 @@ void Label::regenerate_word_cache() {
} }
if (current=='\n') { if (current=='\n') {
insert_newline=true; insert_newline=true;
} else { } else {
total_char_cache++; total_char_cache++;
} }
if (i<text.length() && text[i] == ' ') {
total_char_cache--; // do not count spaces
}
} else { } else {
@ -442,7 +445,8 @@ void Label::regenerate_word_cache() {
last_width=line_width; last_width=line_width;
} }
total_char_cache -= line_count + 1; // do not count new lines (including the first one)
if (!autowrap) { if (!autowrap) {
@ -519,6 +523,7 @@ String Label::get_text() const {
return text; return text;
} }
void Label::set_visible_characters(int p_amount) { void Label::set_visible_characters(int p_amount) {
visible_chars=p_amount; visible_chars=p_amount;
@ -582,7 +587,7 @@ void Label::_bind_methods() {
ADD_PROPERTY( PropertyInfo( Variant::INT, "valign", PROPERTY_HINT_ENUM,"Top,Center,Bottom,Fill" ),_SCS("set_valign"),_SCS("get_valign") ); ADD_PROPERTY( PropertyInfo( Variant::INT, "valign", PROPERTY_HINT_ENUM,"Top,Center,Bottom,Fill" ),_SCS("set_valign"),_SCS("get_valign") );
ADD_PROPERTY( PropertyInfo( Variant::BOOL, "autowrap"),_SCS("set_autowrap"),_SCS("has_autowrap") ); ADD_PROPERTY( PropertyInfo( Variant::BOOL, "autowrap"),_SCS("set_autowrap"),_SCS("has_autowrap") );
ADD_PROPERTY( PropertyInfo( Variant::BOOL, "uppercase"),_SCS("set_uppercase"),_SCS("is_uppercase") ); ADD_PROPERTY( PropertyInfo( Variant::BOOL, "uppercase"),_SCS("set_uppercase"),_SCS("is_uppercase") );
ADD_PROPERTY( PropertyInfo( Variant::REAL, "percent_visible"),_SCS("set_percent_visible"),_SCS("get_percent_visible") ); ADD_PROPERTY( PropertyInfo( Variant::REAL, "percent_visible", PROPERTY_HINT_RANGE,"0,1,0.001"),_SCS("set_percent_visible"),_SCS("get_percent_visible") );
} }