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

Rollback to original/way better constrated captions colors.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@5437 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Philippe Houdoin
2003-11-21 23:07:03 +00:00
parent 83abf055e9
commit 1021ea1790
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/showimage/ShowImageView.cpp
+9 -9
View File
@@ -549,7 +549,7 @@ ShowImageView::DrawCaption()
BFont font(be_plain_font); BFont font(be_plain_font);
BPoint pos; BPoint pos;
BRect rect; BRect rect;
width = font.StringWidth(fCaption.String())+1; // 1 for text shadow width = font.StringWidth(fCaption.String()) + 1; // 1 for text shadow
font.GetHeight(&fontHeight); font.GetHeight(&fontHeight);
height = fontHeight.ascent + fontHeight.descent; height = fontHeight.ascent + fontHeight.descent;
// center text horizontally // center text horizontally
@@ -558,14 +558,14 @@ ShowImageView::DrawCaption()
pos.y = bounds.bottom - fontHeight.descent - 5; pos.y = bounds.bottom - fontHeight.descent - 5;
// background rectangle // background rectangle
rect.Set(0, 0, (width-1)+4, (height-1)+4+1); // 4 for border and 1 for text shadow rect.Set(0, 0, (width-1)+2, (height-1)+2+1); // 2 for border and 1 for text shadow
rect.OffsetTo(pos); rect.OffsetTo(pos);
rect.OffsetBy(-3, -2-fontHeight.ascent); // -2 for border rect.OffsetBy(-1, -1-fontHeight.ascent); // -1 for border
PushState(); PushState();
// draw background // draw background
SetDrawingMode(B_OP_ALPHA); SetDrawingMode(B_OP_ALPHA);
SetHighColor(192, 192, 192, 160); SetHighColor(0, 0, 255, 128);
FillRect(rect); FillRect(rect);
// draw text // draw text
SetDrawingMode(B_OP_OVER); SetDrawingMode(B_OP_OVER);
@@ -573,12 +573,12 @@ ShowImageView::DrawCaption()
SetLowColor(B_TRANSPARENT_COLOR); SetLowColor(B_TRANSPARENT_COLOR);
// text shadow // text shadow
pos += BPoint(1, 1); pos += BPoint(1, 1);
SetHighColor(0, 0, 0, 128); SetHighColor(0, 0, 0);
SetPenSize(1); SetPenSize(1);
DrawString(fCaption.String(), pos); DrawString(fCaption.String(), pos);
// text // text
pos -= BPoint(1, 1); pos -= BPoint(1, 1);
SetHighColor(255, 255, 255, 255); SetHighColor(255, 255, 0);
DrawString(fCaption.String(), pos); DrawString(fCaption.String(), pos);
PopState(); PopState();
} }
@@ -592,7 +592,7 @@ ShowImageView::EraseCaption()
BFont font(be_plain_font); BFont font(be_plain_font);
BPoint pos; BPoint pos;
BRect rect; BRect rect;
width = font.StringWidth(fCaption.String())+1; // 1 for text shadow width = font.StringWidth(fCaption.String()) + 1; // 1 for text shadow
font.GetHeight(&fontHeight); font.GetHeight(&fontHeight);
height = fontHeight.ascent + fontHeight.descent; height = fontHeight.ascent + fontHeight.descent;
// center text horizontally // center text horizontally
@@ -601,9 +601,9 @@ ShowImageView::EraseCaption()
pos.y = bounds.bottom - fontHeight.descent - 5; pos.y = bounds.bottom - fontHeight.descent - 5;
// background rectangle // background rectangle
rect.Set(0, 0, (width-1)+4, (height-1)+4+1); // 4 for border and 1 for text shadow rect.Set(0, 0, (width-1)+2, (height-1)+2+1); // 2 for border and 1 for text shadow
rect.OffsetTo(pos); rect.OffsetTo(pos);
rect.OffsetBy(-3, -2-fontHeight.ascent); // -2 for border rect.OffsetBy(-1, -1-fontHeight.ascent); // -1 for border
// draw over portion of image where caption is located // draw over portion of image where caption is located
Draw(rect); Draw(rect);