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

Improved coding style and the looks of the matched pattern in choices.

Browse Source 
git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@275 94f232f2-1747-11df-bad5-a5bfde151594
This commit is contained in:
stippi
2012-07-03 15:32:58 +02:00
committed by Alexandre Deckner
parent dad87be6e5
commit c1bbe7400c
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/webpositive/autocompletion/AutoCompleterDefaultImpl.cpp
+16 -10
View File
@@ -243,15 +243,19 @@ void
BDefaultChoiceView::ListItem::DrawItem(BView* owner, BRect frame, BDefaultChoiceView::ListItem::DrawItem(BView* owner, BRect frame,
bool complete) bool complete)
{ {
rgb_color textCol, backCol, matchCol; rgb_color textColor;
rgb_color nonMatchTextColor;
rgb_color backColor;
rgb_color matchColor;
if (IsSelected()) { if (IsSelected()) {
textCol = ui_color(B_MENU_SELECTED_ITEM_TEXT_COLOR); textColor = ui_color(B_MENU_SELECTED_ITEM_TEXT_COLOR);
backCol = ui_color(B_MENU_SELECTED_BACKGROUND_COLOR); backColor = ui_color(B_MENU_SELECTED_BACKGROUND_COLOR);
} else { } else {
textCol = ui_color(B_DOCUMENT_TEXT_COLOR); textColor = ui_color(B_DOCUMENT_TEXT_COLOR);
backCol = ui_color(B_DOCUMENT_BACKGROUND_COLOR); backColor = ui_color(B_DOCUMENT_BACKGROUND_COLOR);
} }
matchCol = tint_color(backCol, (B_NO_TINT + B_DARKEN_1_TINT) / 2); matchColor = tint_color(backColor, (B_NO_TINT + B_DARKEN_1_TINT) / 2);
nonMatchTextColor = tint_color(backColor, 1.7);
BFont font; BFont font;
font_height fontHeight; font_height fontHeight;
@@ -262,26 +266,28 @@ BDefaultChoiceView::ListItem::DrawItem(BView* owner, BRect frame,
float w; float w;
if (fPreText.Length()) { if (fPreText.Length()) {
w = owner->StringWidth(fPreText.String()); w = owner->StringWidth(fPreText.String());
owner->SetLowColor(backCol); owner->SetLowColor(backColor);
owner->FillRect(BRect(xPos, frame.top, xPos + w - 1, frame.bottom), owner->FillRect(BRect(xPos, frame.top, xPos + w - 1, frame.bottom),
B_SOLID_LOW); B_SOLID_LOW);
owner->SetHighColor(textCol); owner->SetHighColor(nonMatchTextColor);
owner->DrawString(fPreText.String(), BPoint(xPos, yPos)); owner->DrawString(fPreText.String(), BPoint(xPos, yPos));
xPos += w; xPos += w;
} }
if (fMatchText.Length()) { if (fMatchText.Length()) {
w = owner->StringWidth(fMatchText.String()); w = owner->StringWidth(fMatchText.String());
owner->SetLowColor(matchCol); owner->SetLowColor(matchColor);
owner->FillRect(BRect(xPos, frame.top, xPos + w - 1, frame.bottom), owner->FillRect(BRect(xPos, frame.top, xPos + w - 1, frame.bottom),
B_SOLID_LOW); B_SOLID_LOW);
owner->SetHighColor(textColor);
owner->DrawString(fMatchText.String(), BPoint(xPos, yPos)); owner->DrawString(fMatchText.String(), BPoint(xPos, yPos));
xPos += w; xPos += w;
} }
if (fPostText.Length()) { if (fPostText.Length()) {
w = owner->StringWidth(fPostText.String()); w = owner->StringWidth(fPostText.String());
owner->SetLowColor(backCol); owner->SetLowColor(backColor);
owner->FillRect(BRect(xPos, frame.top, xPos + w - 1, frame.bottom), owner->FillRect(BRect(xPos, frame.top, xPos + w - 1, frame.bottom),
B_SOLID_LOW); B_SOLID_LOW);
owner->SetHighColor(nonMatchTextColor);
owner->DrawString(fPostText.String(), BPoint(xPos, yPos)); owner->DrawString(fPostText.String(), BPoint(xPos, yPos));
} }
} }