Truncate background image name in multibyte-aware way

haiku · Jan 15, 2013 · 3c7eaf3 · 3c7eaf3
1 parent 2b934bb
commit 3c7eaf3
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/src/preferences/backgrounds/BackgroundImage.cpp b/src/preferences/backgrounds/BackgroundImage.cpp
@@ -561,16 +561,15 @@ Image::Image(BPath path)
 	fBitmap(NULL),
 	fPath(path)
 {
-	const int32 kMaxWidth = 40;
+	const int32 kMaxNameChars = 40;
 	fName = path.Leaf();
-	int extra = fName.Length() - kMaxWidth;
+	int extra = fName.CountChars() - kMaxNameChars;
 	if (extra > 0) {
+		BString extension;
 		int offset = fName.FindLast('.');
-		if (offset > 0) {
-			offset++;
-			fName.Truncate(offset - extra) << B_UTF8_ELLIPSIS;
-			fName.Append(path.Leaf() + offset);
-		}
+		if (offset > 0)
+			fName.CopyInto(extension, ++offset, -1);
+		fName.TruncateChars(kMaxNameChars) << B_UTF8_ELLIPSIS << extension;
 	}
 }