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

Made Navigator color-sensitive. More to come.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24208 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rene Gollent
2008-03-02 21:16:43 +00:00
parent c7da4347df
commit c8ae58fd4f
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/Navigator.cpp
+13 -14
View File
@@ -46,11 +46,6 @@ namespace BPrivate {
static const int32 kMaxHistory = 32; static const int32 kMaxHistory = 32;
static const rgb_color kBgColor = {220, 220, 220, 255};
static const rgb_color kShineColor = {255, 255, 255, 255};
static const rgb_color kHalfDarkColor = {200, 200, 200, 255};
static const rgb_color kDarkColor = {166, 166, 166, 255};
} }
// BPictureButton() will crash when giving zero pointers, // BPictureButton() will crash when giving zero pointers,
@@ -67,9 +62,9 @@ BNavigatorButton::BNavigatorButton(BRect rect, const char *name, BMessage *messa
{ {
// Clear to background color to // Clear to background color to
// avoid ugly border on click // avoid ugly border on click
SetViewColor(kBgColor); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
SetHighColor(kBgColor); SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));
SetLowColor(kBgColor); SetLowColor(ui_color(B_PANEL_BACKGROUND_COLOR));
} }
BNavigatorButton::~BNavigatorButton() BNavigatorButton::~BNavigatorButton()
@@ -104,7 +99,7 @@ BNavigatorButton::SetPicture(BBitmap *bitmap, bool enabled, bool on)
BView view(bitmap->Bounds(), "", 0, 0); BView view(bitmap->Bounds(), "", 0, 0);
AddChild(&view); AddChild(&view);
view.BeginPicture(&picture); view.BeginPicture(&picture);
view.SetHighColor(kBgColor); view.SetHighColor(ui_color(B_PANEL_BACKGROUND_COLOR));
view.FillRect(view.Bounds()); view.FillRect(view.Bounds());
view.SetDrawingMode(B_OP_OVER); view.SetDrawingMode(B_OP_OVER);
view.DrawBitmap(bitmap, BPoint(0, 0)); view.DrawBitmap(bitmap, BPoint(0, 0));
@@ -135,7 +130,7 @@ BNavigator::BNavigator(const Model *model, BRect rect, uint32 resizeMask)
// Get initial path // Get initial path
model->GetPath(&fPath); model->GetPath(&fPath);
SetViewColor(kBgColor); SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR));
float top = 2 + (be_plain_font->Size() - 8) / 2; float top = 2 + (be_plain_font->Size() - 8) / 2;
@@ -186,12 +181,16 @@ BNavigator::AttachedToWindow()
void void
BNavigator::Draw(BRect) BNavigator::Draw(BRect)
{ {
rgb_color bgColor = ui_color(B_PANEL_BACKGROUND_COLOR);
rgb_color shineColor = ui_color(B_SHINE_COLOR);
rgb_color halfDarkColor = tint_color(bgColor, B_DARKEN_1_TINT);
rgb_color darkColor = tint_color(bgColor, B_DARKEN_2_TINT);
// Draws a beveled smooth border // Draws a beveled smooth border
BeginLineArray(4); BeginLineArray(4);
AddLine(Bounds().LeftTop(), Bounds().RightTop(), kShineColor); AddLine(Bounds().LeftTop(), Bounds().RightTop(), shineColor);
AddLine(Bounds().LeftTop(), Bounds().LeftBottom() - BPoint(0, 1), kShineColor); AddLine(Bounds().LeftTop(), Bounds().LeftBottom() - BPoint(0, 1), shineColor);
AddLine(Bounds().LeftBottom() - BPoint(-1, 1), Bounds().RightBottom() - BPoint(0, 1), kHalfDarkColor); AddLine(Bounds().LeftBottom() - BPoint(-1, 1), Bounds().RightBottom() - BPoint(0, 1), halfDarkColor);
AddLine(Bounds().LeftBottom(), Bounds().RightBottom(), kDarkColor); AddLine(Bounds().LeftBottom(), Bounds().RightBottom(), darkColor);
EndLineArray(); EndLineArray();
} }