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

AboutSystem: Simplify updating colors.

Browse Source 
Change-Id: Ide961bc25e6e84dcac41d6a2b62130e759762e8b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/9773
Reviewed-by: nephele nephele <[email protected]>
Tested-by: Commit checker robot <[email protected]>
This commit is contained in:
John Scipione
2025-11-15 18:38:56 +00:00
committed by nephele nephele
parent afe2270c98
commit 646294695d
1 changed files with 41 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/aboutsystem/AboutSystem.cpp
+41 -118
View File
@@ -44,7 +44,6 @@
#include <PathFinder.h> #include <PathFinder.h>
#include <PopUpMenu.h> #include <PopUpMenu.h>
#include <Resources.h> #include <Resources.h>
#include <Screen.h>
#include <ScrollView.h> #include <ScrollView.h>
#include <String.h> #include <String.h>
#include <StringFormat.h> #include <StringFormat.h>
@@ -110,6 +109,8 @@ static const rgb_color kIdealHaikuOrange = { 255, 69, 0, 255 };
static const rgb_color kIdealHaikuYellow = { 255, 176, 0, 255 }; static const rgb_color kIdealHaikuYellow = { 255, 176, 0, 255 };
static const rgb_color kIdealBeOSBlue = { 0, 0, 200, 255 }; static const rgb_color kIdealBeOSBlue = { 0, 0, 200, 255 };
static const rgb_color kIdealBeOSRed = { 200, 0, 0, 255 }; static const rgb_color kIdealBeOSRed = { 200, 0, 0, 255 };
static const rgb_color kBlack = { 0, 0, 0, 255 };
static const rgb_color kWhite = { 255, 255, 255, 255 };
static const char* kBSDTwoClause = B_TRANSLATE_MARK("BSD (2-clause)"); static const char* kBSDTwoClause = B_TRANSLATE_MARK("BSD (2-clause)");
static const char* kBSDThreeClause = B_TRANSLATE_MARK("BSD (3-clause)"); static const char* kBSDThreeClause = B_TRANSLATE_MARK("BSD (3-clause)");
@@ -237,8 +238,8 @@ public:
virtual status_t Archive(BMessage* archive, bool deep = true) const; virtual status_t Archive(BMessage* archive, bool deep = true) const;
static BArchivable* Instantiate(BMessage* archive); static BArchivable* Instantiate(BMessage* archive);
virtual void AttachedToWindow();
virtual void AllAttached(); virtual void AllAttached();
virtual void AttachedToWindow();
virtual void Draw(BRect); virtual void Draw(BRect);
virtual void MessageReceived(BMessage* message); virtual void MessageReceived(BMessage* message);
virtual void Pulse(); virtual void Pulse();
@@ -249,9 +250,8 @@ public:
float MinHeight() const { return fCachedMinHeight; }; float MinHeight() const { return fCachedMinHeight; };
private: private:
void _AdjustColors(); void _UpdateColors();
void _AdjustTextColors() const; bool _IsReplicant() const;
rgb_color _DesktopTextColor(int32 workspace = -1) const;
bool _OnDesktop() const; bool _OnDesktop() const;
void _ResizeBy(float, float); void _ResizeBy(float, float);
void _ResizeTo(float, float); void _ResizeTo(float, float);
@@ -279,8 +279,6 @@ private:
float _UptimeHeight(); float _UptimeHeight();
private: private:
rgb_color fDesktopTextColor;
BStringView* fVersionLabelView; BStringView* fVersionLabelView;
BStringView* fVersionInfoView; BStringView* fVersionInfoView;
BStringView* fCPULabelView; BStringView* fCPULabelView;
@@ -693,6 +691,15 @@ SysInfoView::Instantiate(BMessage* archive)
} }
void
SysInfoView::AllAttached()
{
BView::AllAttached();
_UpdateColors();
}
void void
SysInfoView::AttachedToWindow() SysInfoView::AttachedToWindow()
{ {
@@ -701,7 +708,7 @@ SysInfoView::AttachedToWindow()
Window()->SetPulseRate(500000); Window()->SetPulseRate(500000);
DoLayout(); DoLayout();
if (_OnDesktop()) { if (_IsReplicant()) {
// if we are a replicant the parent view doesn't do this for us // if we are a replicant the parent view doesn't do this for us
CacheInitialSize(); CacheInitialSize();
// add extra height for dragger: fixed, and insets: font-dependent // add extra height for dragger: fixed, and insets: font-dependent
@@ -712,20 +719,6 @@ SysInfoView::AttachedToWindow()
} }
void
SysInfoView::AllAttached()
{
BView::AllAttached();
if (_OnDesktop())
fDesktopTextColor = _DesktopTextColor();
// Update colors here to override system colors for replicant,
// this works when the view is in AboutView too.
_AdjustColors();
}
void void
SysInfoView::CacheInitialSize() SysInfoView::CacheInitialSize()
{ {
@@ -762,7 +755,7 @@ SysInfoView::Draw(BRect updateRect)
BView::Draw(updateRect); BView::Draw(updateRect);
// stroke a line around the view // stroke a line around the view
if (_OnDesktop() && fDragger != NULL && fDragger->AreDraggersDrawn()) if (_IsReplicant() && fDragger != NULL && fDragger->AreDraggersDrawn())
StrokeRect(Bounds()); StrokeRect(Bounds());
} }
@@ -772,51 +765,22 @@ SysInfoView::MessageReceived(BMessage* message)
{ {
switch (message->what) { switch (message->what) {
case B_COLORS_UPDATED: case B_COLORS_UPDATED:
{
if (_OnDesktop()) if (_OnDesktop())
break; break;
if (message->HasColor(ui_color_name(B_PANEL_TEXT_COLOR))) { if (message->HasColor(ui_color_name(B_PANEL_BACKGROUND_COLOR))
_AdjustTextColors(); || message->HasColor(ui_color_name(B_PANEL_TEXT_COLOR))) {
_UpdateColors();
Invalidate(); Invalidate();
} }
break; break;
}
case B_WORKSPACE_ACTIVATED: case B_WORKSPACE_ACTIVATED:
{ if (_OnDesktop()) {
if (!_OnDesktop()) _UpdateColors();
break;
bool active;
int32 workspace;
if (message->FindBool("active", &active) == B_OK && active
&& message->FindInt32("workspace", &workspace) == B_OK) {
BLayout* layout = GetLayout();
int32 itemCount = layout->CountItems() - 2;
// leave out dragger and uptime
fDesktopTextColor = _DesktopTextColor(workspace);
SetHighColor(fDesktopTextColor);
for (int32 index = 0; index < itemCount; index++) {
BView* view = layout->ItemAt(index)->View();
if (view == NULL)
continue;
view->SetDrawingMode(B_OP_ALPHA);
view->SetHighColor(fDesktopTextColor);
}
fUptimeView->SetDrawingMode(B_OP_ALPHA);
fUptimeView->SetFontAndColor(NULL, 0, &fDesktopTextColor);
Invalidate(); Invalidate();
} }
break; break;
}
default: default:
BView::MessageReceived(message); BView::MessageReceived(message);
@@ -844,70 +808,39 @@ SysInfoView::Pulse()
void void
SysInfoView::_AdjustColors() SysInfoView::_UpdateColors()
{ {
if (_OnDesktop()) { if (_OnDesktop()) {
// SetColor rgb_color textColor = (Parent()->ViewColor().Brightness()
SetFlags(Flags() | B_TRANSPARENT_BACKGROUND); <= ui_color(B_DESKTOP_COLOR).Brightness() ? kWhite : kBlack);
SetDrawingMode(B_OP_ALPHA); SetDrawingMode(B_OP_ALPHA);
SetFlags(Flags() | B_TRANSPARENT_BACKGROUND);
SetViewColor(B_TRANSPARENT_COLOR); SetViewColor(B_TRANSPARENT_COLOR);
SetLowColor(B_TRANSPARENT_COLOR); SetLowColor(blend_color(B_TRANSPARENT_COLOR, textColor, 192));
SetHighColor(fDesktopTextColor); SetHighColor(textColor);
} else {
// SetUIColor
SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
SetLowUIColor(B_PANEL_BACKGROUND_COLOR);
SetHighUIColor(B_PANEL_TEXT_COLOR);
}
_AdjustTextColors(); BLayout* layout = GetLayout();
Invalidate(); int32 itemCount = layout->CountItems() - 2;
} // leave out dragger and uptime
void
SysInfoView::_AdjustTextColors() const
{
BLayout* layout = GetLayout();
int32 itemCount = layout->CountItems() - 2;
// leave out dragger and uptime
if (_OnDesktop()) {
// SetColor
for (int32 index = 0; index < itemCount; index++) { for (int32 index = 0; index < itemCount; index++) {
BView* view = layout->ItemAt(index)->View(); BView* view = layout->ItemAt(index)->View();
if (view == NULL) if (view == NULL)
continue; continue;
view->SetFlags(view->Flags() | B_TRANSPARENT_BACKGROUND);
view->SetDrawingMode(B_OP_ALPHA); view->SetDrawingMode(B_OP_ALPHA);
view->SetFlags(view->Flags() | B_TRANSPARENT_BACKGROUND);
view->SetViewColor(B_TRANSPARENT_COLOR); view->SetViewColor(B_TRANSPARENT_COLOR);
view->SetLowColor(blend_color(B_TRANSPARENT_COLOR, view->SetLowColor(blend_color(B_TRANSPARENT_COLOR, textColor, 192));
fDesktopTextColor, 192)); view->SetHighColor(textColor);
view->SetHighColor(fDesktopTextColor);
} }
fUptimeView->SetFlags(fUptimeView->Flags() | B_TRANSPARENT_BACKGROUND);
fUptimeView->SetDrawingMode(B_OP_ALPHA); fUptimeView->SetDrawingMode(B_OP_ALPHA);
fUptimeView->SetFlags(fUptimeView->Flags() | B_TRANSPARENT_BACKGROUND);
fUptimeView->SetViewColor(B_TRANSPARENT_COLOR); fUptimeView->SetViewColor(B_TRANSPARENT_COLOR);
fUptimeView->SetLowColor(blend_color(B_TRANSPARENT_COLOR, fUptimeView->SetLowColor(blend_color(B_TRANSPARENT_COLOR, textColor, 192));
fDesktopTextColor, 192)); fUptimeView->SetFontAndColor(NULL, 0, &textColor);
fUptimeView->SetFontAndColor(NULL, 0, &fDesktopTextColor);
} else { } else {
// SetUIColor
for (int32 index = 0; index < itemCount; index++) {
BView* view = layout->ItemAt(index)->View();
if (view == NULL)
continue;
view->SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
view->SetLowUIColor(B_PANEL_BACKGROUND_COLOR);
view->SetHighUIColor(B_PANEL_TEXT_COLOR);
}
fUptimeView->SetViewUIColor(B_PANEL_BACKGROUND_COLOR); fUptimeView->SetViewUIColor(B_PANEL_BACKGROUND_COLOR);
fUptimeView->SetLowUIColor(B_PANEL_BACKGROUND_COLOR); fUptimeView->SetLowUIColor(B_PANEL_BACKGROUND_COLOR);
rgb_color textColor = ui_color(B_PANEL_TEXT_COLOR); rgb_color textColor = ui_color(B_PANEL_TEXT_COLOR);
@@ -916,20 +849,10 @@ SysInfoView::_AdjustTextColors() const
} }
rgb_color bool
SysInfoView::_DesktopTextColor(int32 workspace) const SysInfoView::_IsReplicant() const
{ {
// set text color to black or white depending on desktop background color return dynamic_cast<AboutWindow*>(Window()) == NULL;
rgb_color textColor;
BScreen screen(Window());
if (workspace < 0)
workspace = current_workspace();
rgb_color viewColor = screen.DesktopColor(workspace);
textColor.blue = textColor.green = textColor.red = viewColor.IsLight() ? 0 : 255;
textColor.alpha = 255;
return textColor;
} }
@@ -945,7 +868,7 @@ SysInfoView::_OnDesktop() const
void void
SysInfoView::_ResizeBy(float widthChange, float heightChange) SysInfoView::_ResizeBy(float widthChange, float heightChange)
{ {
if (!_OnDesktop() || (widthChange == 0 && heightChange == 0)) if (!_IsReplicant() || (widthChange == 0 && heightChange == 0))
return; return;
ResizeBy(widthChange, heightChange); ResizeBy(widthChange, heightChange);