From Adrien Destugues <pulkomandy@xxxxxxxxx>:
Adrien Destugues has uploaded this change for review. (
https://review.haiku-os.org/c/haiku/+/3560 ;)
Change subject: DeskCalc: fix live updating of button text color
......................................................................
DeskCalc: fix live updating of button text color
---
M src/apps/deskcalc/CalcView.cpp
1 file changed, 10 insertions(+), 3 deletions(-)
git pull ssh://git.haiku-os.org:22/haiku refs/changes/60/3560/1
diff --git a/src/apps/deskcalc/CalcView.cpp b/src/apps/deskcalc/CalcView.cpp
index aa1edde..e2b86ec 100644
--- a/src/apps/deskcalc/CalcView.cpp
+++ b/src/apps/deskcalc/CalcView.cpp
@@ -293,9 +293,12 @@
{
if (message->what == B_COLORS_UPDATED && !fHasCustomBaseColor) {
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();
+ } else {
+ fExpressionTextColor = ui_color(B_DOCUMENT_TEXT_COLOR);
+ fButtonTextColor = ui_color(B_PANEL_TEXT_COLOR);
}
return;
@@ -1199,8 +1202,12 @@
_ParseCalcDesc(fKeypadDescription);
// colorize based on base color.
- _Colorize();
-
+ if (fHasCustomBaseColor)
+ _Colorize();
+ else {
+ fExpressionTextColor = ui_color(B_DOCUMENT_TEXT_COLOR);
+ fButtonTextColor = ui_color(B_PANEL_TEXT_COLOR);
+ }
return B_OK;
}
--
To view, visit https://review.haiku-os.org/c/haiku/+/3560
To unsubscribe, or for help writing mail filters, visit
https://review.haiku-os.org/settings
Gerrit-Project: haiku
Gerrit-Branch: master
Gerrit-Change-Id: I107731efec03a8c9661b89e26255a4fe91def79b
Gerrit-Change-Number: 3560
Gerrit-PatchSet: 1
Gerrit-Owner: Adrien Destugues <pulkomandy@xxxxxxxxx>
Gerrit-MessageType: newchange
