Truncate Background image name to avoid layout problem

Fixes #7406 Signed-off-by: Siarzhuk Zharski <zharik@gmx.li>
haiku · Jan 13, 2013 · b4fdcd5 · b4fdcd5
1 parent fef016c
commit b4fdcd5
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/src/preferences/backgrounds/BackgroundImage.cpp b/src/preferences/backgrounds/BackgroundImage.cpp
@@ -561,7 +561,17 @@ Image::Image(BPath path)
 	fBitmap(NULL),
 	fPath(path)
 {
-	name = path.Leaf();
+	const int32 kMaxWidth = 40;
+	fName = path.Leaf();
+	int extra = fName.Length() - kMaxWidth;
+	if (extra > 0) {
+		int offset = fName.FindLast('.');
+		if (offset > 0) {
+			offset++;
+			fName.Truncate(offset - extra) << B_UTF8_ELLIPSIS;
+			fName.Append(path.Leaf() + offset);
+		}
+	}
 }
 
 

diff --git a/src/preferences/backgrounds/BackgroundImage.h b/src/preferences/backgrounds/BackgroundImage.h
@@ -165,13 +165,13 @@ class Image {
 	~Image();
 
 	void UnloadBitmap();
-	const char* GetName() {return name.String();}
+	const char* GetName() { return fName.String(); }
 	BBitmap* GetBitmap();
-	BPath GetPath() {return fPath;}
+	BPath GetPath() { return fPath; }
 private:
 	BBitmap* fBitmap;
 	BPath fPath;
-	BString name;
+	BString fName;
 };
 
 #endif