瀏覽代碼

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

marynate 11 年之前
父節點
當前提交
56d9faebab
共有 3 個文件被更改,包括 4 次插入4 次删除
  1. 1 1
      core/ustring.cpp
  2. 1 1
      scene/audio/sample_player.cpp
  3. 2 2
      tools/editor/property_editor.cpp

+ 1 - 1
core/ustring.cpp

@@ -2640,7 +2640,7 @@ String String::right(int p_pos) const {
 	if (p_pos<0)
 		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 {

+ 1 - 1
scene/audio/sample_player.cpp

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

+ 2 - 2
tools/editor/property_editor.cpp

@@ -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 );
 		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)
 			item->set_text(0, name.capitalize() );
 		else
@@ -2099,7 +2099,7 @@ void PropertyEditor::update_tree() {
 
 		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) {
 			item->set_custom_bg_color(0,col);