godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make String::right count from pos instead of pos+1

This commit is contained in:
marynate 2014-05-12 18:45:04 +08:00
parent 1b45a38fb5
commit 56d9faebab
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/ustring.cpp
View File

@ -2640,7 +2640,7 @@ String String::right(int p_pos) const {
if (p_pos<0) if (p_pos<0)
return ""; return "";
return substr(p_pos+1,(length()-p_pos)-1); return substr(p_pos,(length()-p_pos));
} }
CharType String::ord_at(int p_idx) const { CharType String::ord_at(int p_idx) const {

2
scene/audio/sample_player.cpp
View File

@ -52,7 +52,7 @@ bool SamplePlayer::_set(const StringName& p_name, const Variant& p_value) {
set_voice_count(p_value); set_voice_count(p_value);
else if (name.begins_with("default/")) { else if (name.begins_with("default/")) {
String what=name.right(7); String what=name.right(8);
if (what=="volume_db") if (what=="volume_db")
set_default_volume_db(p_value); set_default_volume_db(p_value);

4
tools/editor/property_editor.cpp
View File

@ -1941,7 +1941,7 @@ TreeItem *PropertyEditor::get_parent_node(String p_path,HashMap<String,TreeItem*
TreeItem *parent = get_parent_node( p_path.left( p_path.find_last("/") ),item_paths,root ); TreeItem *parent = get_parent_node( p_path.left( p_path.find_last("/") ),item_paths,root );
item = tree->create_item( parent ); item = tree->create_item( parent );
String name = (p_path.find("/")!=-1)?p_path.right( p_path.find_last("/") ):p_path; String name = (p_path.find("/")!=-1)?p_path.right( p_path.find_last("/")+1 ):p_path;
if (capitalize_paths) if (capitalize_paths)
item->set_text(0, name.capitalize() ); item->set_text(0, name.capitalize() );
else else
@ -2099,7 +2099,7 @@ void PropertyEditor::update_tree() {
TreeItem * item = tree->create_item( parent ); TreeItem * item = tree->create_item( parent );
String name = (p.name.find("/")!=-1)?p.name.right( p.name.find_last("/") ):p.name; String name = (p.name.find("/")!=-1)?p.name.right( p.name.find_last("/")+1 ):p.name;
if (level>0) { if (level>0) {
item->set_custom_bg_color(0,col); item->set_custom_bg_color(0,col);