diff options
| author | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-12-19 00:56:53 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@seriouslyembedded.com> | 2015-12-19 00:56:53 +0100 |
| commit | 0211a32e1f6832629c250434f86d25003da2a9be (patch) | |
| tree | e072dd2042e48ddb6720301f40af9d501766e70d | |
| parent | 185c970da933c07c62e152b0c0d61847e6100769 (diff) | |
| download | uGFX-0211a32e1f6832629c250434f86d25003da2a9be.tar.gz uGFX-0211a32e1f6832629c250434f86d25003da2a9be.tar.bz2 uGFX-0211a32e1f6832629c250434f86d25003da2a9be.zip | |
Fixing 'progress' color of built-in widget styles
| -rw-r--r-- | demos/modules/gwin/widgets/main.c | 2 | ||||
| -rw-r--r-- | docs/releases.txt | 1 | ||||
| -rw-r--r-- | src/gwin/gwin_widget.c | 4 | ||||
| -rw-r--r-- | tools/studio/options_v2.json | 4 |
4 files changed, 6 insertions, 5 deletions
diff --git a/demos/modules/gwin/widgets/main.c b/demos/modules/gwin/widgets/main.c index 8f5a6329..8252002b 100644 --- a/demos/modules/gwin/widgets/main.c +++ b/demos/modules/gwin/widgets/main.c @@ -56,7 +56,7 @@ static const GWidgetStyle YellowWidgetStyle = { HTML2COLOR(0x0000FF), // text HTML2COLOR(0x404040), // edge HTML2COLOR(0xE0E0E0), // fill - HTML2COLOR(0xE0E0E0) // progress - inactive area + HTML2COLOR(0x00E000) // progress - active area }, // disabled color set diff --git a/docs/releases.txt b/docs/releases.txt index 5bd6ccbb..2fa6ef0f 100644 --- a/docs/releases.txt +++ b/docs/releases.txt @@ -9,6 +9,7 @@ FEATURE: Added support for NIOS-II platform FEATURE: Added Altera-MAX10-NEEK board support FIX: Vastly improving keyboard widget default rendering FEATURE: Added ILI9342 driver +FIX: Fixing issues where wrong 'progress' color from widget style palette was used *** Release 2.4 *** diff --git a/src/gwin/gwin_widget.c b/src/gwin/gwin_widget.c index b5095521..38c98903 100644 --- a/src/gwin/gwin_widget.c +++ b/src/gwin/gwin_widget.c @@ -36,7 +36,7 @@ const GWidgetStyle WhiteWidgetStyle = { HTML2COLOR(0x000000), // text HTML2COLOR(0x404040), // edge HTML2COLOR(0xE0E0E0), // fill - HTML2COLOR(0xE0E0E0) // progress - inactive area + HTML2COLOR(0x00E000) // progress - active area }, // disabled color set @@ -66,7 +66,7 @@ const GWidgetStyle BlackWidgetStyle = { HTML2COLOR(0xC0C0C0), // text HTML2COLOR(0xC0C0C0), // edge HTML2COLOR(0x606060), // fill - HTML2COLOR(0x404040) // progress - inactive area + HTML2COLOR(0x008000) // progress - active area }, // disabled color set diff --git a/tools/studio/options_v2.json b/tools/studio/options_v2.json index d2d7e1f0..d6d7c99a 100644 --- a/tools/studio/options_v2.json +++ b/tools/studio/options_v2.json @@ -317,7 +317,7 @@ { "User": "", "Library": "", - "RGB": "0xE0E0E0" + "RGB": "0x00E000" } }, "Disabled": @@ -417,7 +417,7 @@ { "User": "", "Library": "", - "RGB": "0x404040" + "RGB": "0x008000" } }, "Disabled": |