From ee6deaf82c7ab73f93fe2e7353e342f25898f220 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 23 Feb 2021 15:23:30 +0100 Subject: [PATCH] Fix C++ build Rename the default color member to base. --- examples/printerdemo/ui/common.60 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/examples/printerdemo/ui/common.60 b/examples/printerdemo/ui/common.60 index d765cbd25..671c10bdf 100644 --- a/examples/printerdemo/ui/common.60 +++ b/examples/printerdemo/ui/common.60 @@ -9,7 +9,7 @@ LICENSE END */ struct ButtonColors := { - default: color, + base: color, pressed: color, hovered: color, } @@ -40,13 +40,13 @@ export global DemoPalette := { property control_foreground: night_mode ? white : #122F7B; // FIXME: the night mode color was not part of the design property primary_push_button_colors: { - default: #6284FF, + base: #6284FF, pressed: #0031e0, hovered: #1a4bff, }; property secondary_push_button_colors: { - default: #FFBF63, + base: #FFBF63, pressed: #eb8a00, hovered: #ffa729, }; @@ -237,7 +237,7 @@ export PushButton := Rectangle { border-radius: 13.5px; - background: pressed ? colors.pressed : (touch_area.has_hover ? colors.hovered : colors.default); + background: pressed ? colors.pressed : (touch_area.has_hover ? colors.hovered : colors.base); height: 27px; // line-height in the design horizontal-stretch: 1;