[haiku-commits] haiku: hrev45153 - src/preferences/backgrounds
- From: zharik@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 13 Jan 2013 20:58:20 +0100 (CET)
hrev45153 adds 1 changeset to branch 'master'
old head: fef016caf6d8ecd012f9685144368c4fbdbf7217
new head: b4fdcd5e54b23457ac79118fd629d2ac4c3a8cdb
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=b4fdcd5+%5Efef016c
----------------------------------------------------------------------------
b4fdcd5: Truncate Background image name to avoid layout problem
Fixes #7406
Signed-off-by: Siarzhuk Zharski <zharik@xxxxxx>
[ Przemysław Buczkowski <przemub@xxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45153
Commit: b4fdcd5e54b23457ac79118fd629d2ac4c3a8cdb
URL: http://cgit.haiku-os.org/haiku/commit/?id=b4fdcd5
Author: Przemysław Buczkowski <przemub@xxxxxxxx>
Date: Sun Jan 13 19:49:44 2013 UTC
Committer: Siarzhuk Zharski <zharik@xxxxxx>
Commit-Date: Sun Jan 13 19:49:44 2013 UTC
Ticket: https://dev.haiku-os.org/ticket/7406
----------------------------------------------------------------------------
2 files changed, 14 insertions(+), 4 deletions(-)
src/preferences/backgrounds/BackgroundImage.cpp | 12 +++++++++++-
src/preferences/backgrounds/BackgroundImage.h | 6 +++---
----------------------------------------------------------------------------
diff --git a/src/preferences/backgrounds/BackgroundImage.cpp
b/src/preferences/backgrounds/BackgroundImage.cpp
index d6c34a6..a4b41ec 100644
--- 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
index aa11a71..1e4ca03 100644
--- a/src/preferences/backgrounds/BackgroundImage.h
+++ b/src/preferences/backgrounds/BackgroundImage.h
@@ -165,13 +165,13 @@ public:
~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
Other related posts:
- » [haiku-commits] haiku: hrev45153 - src/preferences/backgrounds - zharik
