Haiku/haiku
Haiku/haiku
1
0
Fork 0
mirror of https://review.haiku-os.org/haiku synced 2025-01-31 18:56:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

DeskCalc: Fix expressionView text color

Browse Source 
Also makes DeskCalc use the Panel text color if the contast is
sufficient
Change-Id: Ibe2d0ad4ba5958f2629be3759091233ad86bcc9d

Change-Id: I51cd7a06e6ea236ec3325d1787ff72ad489fe868
Reviewed-on: https://review.haiku-os.org/c/haiku/+/7488
Tested-by: Commit checker robot <no-reply+buildbot@haiku-os.org>
Reviewed-by: waddlesplash <waddlesplash@gmail.com>
This commit is contained in:
Pascal Abresch 2024-02-28 20:12:41 +01:00 committed by waddlesplash
parent 629f071bb9
commit b005f8c975
3 changed files with 11 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/apps/deskcalc/CalcView.cpp
View File

@ -193,12 +193,11 @@ CalcView::Instantiate(BMessage* archive)
CalcView::CalcView(BRect frame, rgb_color rgbBaseColor, BMessage* settings)
:
BView(frame, "DeskCalc", B_FOLLOW_ALL_SIDES, B_WILL_DRAW | B_FRAME_EVENTS),
fColumns(5),
fRows(4),
fBaseColor(rgbBaseColor),
fExpressionBGColor((rgb_color){ 0, 0, 0, 255 }),
fHasCustomBaseColor(rgbBaseColor != ui_color(B_PANEL_BACKGROUND_COLOR)),
fWidth(1),
@ -227,11 +226,11 @@ CalcView::CalcView(BRect frame, rgb_color rgbBaseColor, BMessage* settings)
CalcView::CalcView(BMessage* archive)
:
BView(archive),
fColumns(5),
fRows(4),
fBaseColor(ui_color(B_PANEL_BACKGROUND_COLOR)),
fExpressionBGColor((rgb_color){ 0, 0, 0, 255 }),
fHasCustomBaseColor(false),
@ -293,12 +292,14 @@ CalcView::AttachedToWindow()
void
CalcView::MessageReceived(BMessage* message)
{
if (message->what == B_COLORS_UPDATED && !fHasCustomBaseColor) {
if (message->what == B_COLORS_UPDATED) {
const char* panelBgColorName = ui_color_name(B_PANEL_BACKGROUND_COLOR);
if (message->HasColor(panelBgColorName)) {
if (message->HasColor(panelBgColorName) && !fHasCustomBaseColor) {
fBaseColor = message->GetColor(panelBgColorName, fBaseColor);
_Colorize();
}
if (message->HasColor(ui_color_name(B_PANEL_TEXT_COLOR)))
_Colorize();
return;
}
@ -906,11 +907,6 @@ CalcView::SaveSettings(BMessage* archive) const
&fBaseColor, sizeof(rgb_color));
}
if (ret == B_OK) {
ret = archive->AddData("rgbDisplay", B_RGB_COLOR_TYPE,
&fExpressionBGColor, sizeof(rgb_color));
}
// record current options
if (ret == B_OK)
ret = fOptions->SaveSettings(archive);
@ -1181,15 +1177,6 @@ CalcView::_LoadSettings(BMessage* archive)
} else
fBaseColor = *color;
if (archive->FindData("rgbDisplay", B_RGB_COLOR_TYPE,
(const void**)&color, &size) < B_OK
|| size != sizeof(rgb_color)) {
fExpressionBGColor = (rgb_color){ 0, 0, 0, 255 };
puts("Missing rgbBaseColor from CalcView archive!\n");
} else {
fExpressionBGColor = *color;
}
fHasCustomBaseColor = fBaseColor != ui_color(B_PANEL_BACKGROUND_COLOR);
// load options
@ -1376,21 +1363,14 @@ CalcView::_FlashKey(int32 key, uint32 flashFlags)
void
CalcView::_Colorize()
{
if (fHasCustomBaseColor) {
// keypad text color
rgb_color panelColor = ui_color(B_PANEL_TEXT_COLOR);
if (rgb_color::Contrast(fBaseColor, panelColor) > 100)
fButtonTextColor = panelColor;
else {
if (fBaseColor.IsLight())
fButtonTextColor = (rgb_color){ 0, 0, 0, 255 };
else
fButtonTextColor = (rgb_color){ 255, 255, 255, 255 };
// expression text color
if (fExpressionBGColor.IsLight())
fExpressionTextColor = (rgb_color){ 0, 0, 0, 255 };
else
fExpressionTextColor = (rgb_color){ 255, 255, 255, 255 };
} else {
fExpressionTextColor = ui_color(B_DOCUMENT_TEXT_COLOR);
fButtonTextColor = ui_color(B_PANEL_TEXT_COLOR);
}
}

2
src/apps/deskcalc/CalcView.h
View File

@ -123,8 +123,6 @@ class _EXPORT CalcView : public BView {
// color scheme
rgb_color fBaseColor;
rgb_color fButtonTextColor;
rgb_color fExpressionBGColor;
rgb_color fExpressionTextColor;
bool fHasCustomBaseColor;

1
src/apps/deskcalc/ExpressionTextView.cpp
View File

@ -42,6 +42,7 @@ ExpressionTextView::ExpressionTextView(BRect frame, CalcView* calcView)
SetDoesUndo(true);
SetColorSpace(B_RGB32);
SetFontAndColor(be_bold_font, B_FONT_ALL);
SetHighUIColor(B_DOCUMENT_TEXT_COLOR);
SetAlignment(B_ALIGN_RIGHT);
}