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

[Haikudepot] Change barberpole colors

Browse Source 
* Feel free to tweak tint and other parameters
* As suggested by waddlesplash this should extend the progressbar
* Should fix #13808
This commit is contained in:
Janus
2017-11-27 23:16:54 +01:00
parent 416c116003
commit 0588dd3ae2
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/haikudepot/ui/WorkStatusView.cpp
+1 -1
View File
@@ -36,7 +36,7 @@ WorkStatusView::WorkStatusView(const char* name)
fProgressLayout->AddView(fProgressBar); fProgressLayout->AddView(fProgressBar);
fProgressBar->SetMaxValue(1.0f); fProgressBar->SetMaxValue(1.0f);
fProgressBar->SetBarHeight(16); fProgressBar->SetBarHeight(20);
fStatusText->SetFontSize(be_plain_font->Size() * 0.9f); fStatusText->SetFontSize(be_plain_font->Size() * 0.9f);
src/apps/haikudepot/ui_generic/BarberPole.cpp
+12 -4
View File
@@ -150,8 +150,10 @@ BarberPole::BarberPole(const char* name)
{ {
// Default colors, chosen from system color scheme // Default colors, chosen from system color scheme
rgb_color defaultColors[2]; rgb_color defaultColors[2];
defaultColors[0] = ui_color(B_CONTROL_HIGHLIGHT_COLOR); rgb_color otherColor = tint_color(ui_color(B_STATUS_BAR_COLOR), 1.3);
defaultColors[1] = ui_color(B_PANEL_BACKGROUND_COLOR); otherColor.alpha = 50;
defaultColors[0] = otherColor;
defaultColors[1] = B_TRANSPARENT_COLOR;
SetColors(defaultColors, 2); SetColors(defaultColors, 2);
} }
@@ -181,13 +183,19 @@ BarberPole::MessageReceived(BMessage* message)
void void
BarberPole::Draw(BRect updateRect) BarberPole::Draw(BRect updateRect)
{ {
if (fIsSpinning) { if (fIsSpinning) {
// Draw color stripes // Draw color stripes
float position = -fStripeWidth * (fNumColors + 0.5) + fScrollOffset; float position = -fStripeWidth * (fNumColors + 0.5) + fScrollOffset;
// Starting position: beginning of the second color cycle // Starting position: beginning of the second color cycle
// The + 0.5 is so we start out without a partially visible stripe // The + 0.5 is so we start out without a partially visible stripe
// on the left side (makes it simpler to loop) // on the left side (makes it simpler to loop)
BRect bounds = Bounds();
bounds.InsetBy(-2, -2);
be_control_look->DrawStatusBar(this, bounds, updateRect,
ui_color(B_PANEL_BACKGROUND_COLOR), ui_color(B_STATUS_BAR_COLOR),
bounds.Width());
SetDrawingMode(B_OP_ALPHA);
uint32 colorIndex = 0; uint32 colorIndex = 0;
for (uint32 i = 0; i < fNumStripes; i++) { for (uint32 i = 0; i < fNumStripes; i++) {
SetHighColor(fColors[colorIndex]); SetHighColor(fColors[colorIndex]);
@@ -202,8 +210,8 @@ BarberPole::Draw(BRect updateRect)
position += fStripeWidth; position += fStripeWidth;
} }
SetDrawingMode(B_OP_COPY);
} }
// Draw box around it // Draw box around it
BRect bounds = Bounds(); BRect bounds = Bounds();
be_control_look->DrawBorder(this, bounds, updateRect, be_control_look->DrawBorder(this, bounds, updateRect,