i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Truncate background image name in multibyte-aware way

Browse Source
This commit is contained in:
Siarzhuk Zharski
2013-01-15 12:56:17 +01:00
parent 2b934bb6ae
commit 3c7eaf396c
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/preferences/backgrounds/BackgroundImage.cpp
+6 -7
View File
@@ -561,16 +561,15 @@ Image::Image(BPath path)
fBitmap(NULL), fBitmap(NULL),
fPath(path) fPath(path)
{ {
const int32 kMaxWidth = 40; const int32 kMaxNameChars = 40;
fName = path.Leaf(); fName = path.Leaf();
int extra = fName.Length() - kMaxWidth; int extra = fName.CountChars() - kMaxNameChars;
if (extra > 0) { if (extra > 0) {
BString extension;
int offset = fName.FindLast('.'); int offset = fName.FindLast('.');
if (offset > 0) { if (offset > 0)
offset++; fName.CopyInto(extension, ++offset, -1);
fName.Truncate(offset - extra) << B_UTF8_ELLIPSIS; fName.TruncateChars(kMaxNameChars) << B_UTF8_ELLIPSIS << extension;
fName.Append(path.Leaf() + offset);
}
} }
} }