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

Notification: truncate long lines

Browse Source 
This happens only if the word-wrapping couldn't fit them (because there
is a very long word in the text)

Fixes #11494.
This commit is contained in:
Adrien Destugues
2014-12-18 14:29:55 +01:00
parent 967a06e055
commit 63a4690e72
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/notification/NotificationView.cpp
+6 -2
View File
@@ -240,7 +240,7 @@ NotificationView::Draw(BRect updateRect)
// Icon size // Icon size
float iconSize = (float)fParent->IconSize(); float iconSize = (float)fParent->IconSize();
BRect stripeRect = Bounds(); BRect stripeRect = Bounds();
stripeRect.right = kIconStripeWidth; stripeRect.right = kIconStripeWidth;
SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR), SetHighColor(tint_color(ui_color(B_PANEL_BACKGROUND_COLOR),
@@ -250,7 +250,7 @@ NotificationView::Draw(BRect updateRect)
SetHighColor(fStripeColor); SetHighColor(fStripeColor);
stripeRect.right = 2; stripeRect.right = 2;
FillRect(stripeRect); FillRect(stripeRect);
SetHighColor(ui_color(B_PANEL_TEXT_COLOR)); SetHighColor(ui_color(B_PANEL_TEXT_COLOR));
// Rectangle for icon and overlay icon // Rectangle for icon and overlay icon
BRect iconRect(0, 0, 0, 0); BRect iconRect(0, 0, 0, 0);
@@ -277,6 +277,10 @@ NotificationView::Draw(BRect updateRect)
LineInfo *l = (*lIt); LineInfo *l = (*lIt);
SetFont(&l->font); SetFont(&l->font);
// Truncate the string. We have already line-wrapped the text but if
// there is a very long 'word' we can only truncate it.
TruncateString(&(l->text), B_TRUNCATE_END,
Bounds().Width() - l->location.x - 8);
DrawString(l->text.String(), l->text.Length(), l->location); DrawString(l->text.String(), l->text.Length(), l->location);
} }