uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Fixing 'progress' color of built-in widget styles

Browse Source
This commit is contained in:
Joel Bodenmann 2015-12-19 00:56:53 +01:00
parent 185c970da9
commit 0211a32e1f
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demos/modules/gwin/widgets/main.c
View File

@ -56,7 +56,7 @@ static const GWidgetStyle YellowWidgetStyle = {
HTML2COLOR(0x0000FF), // text HTML2COLOR(0x0000FF), // text
HTML2COLOR(0x404040), // edge HTML2COLOR(0x404040), // edge
HTML2COLOR(0xE0E0E0), // fill HTML2COLOR(0xE0E0E0), // fill
HTML2COLOR(0xE0E0E0) // progress - inactive area HTML2COLOR(0x00E000) // progress - active area
}, },
// disabled color set // disabled color set

1
docs/releases.txt
View File

@ -9,6 +9,7 @@ FEATURE: Added support for NIOS-II platform
FEATURE: Added Altera-MAX10-NEEK board support FEATURE: Added Altera-MAX10-NEEK board support
FIX: Vastly improving keyboard widget default rendering FIX: Vastly improving keyboard widget default rendering
FEATURE: Added ILI9342 driver FEATURE: Added ILI9342 driver
FIX: Fixing issues where wrong 'progress' color from widget style palette was used
*** Release 2.4 *** *** Release 2.4 ***

4
src/gwin/gwin_widget.c
View File

@ -36,7 +36,7 @@ const GWidgetStyle WhiteWidgetStyle = {
HTML2COLOR(0x000000), // text HTML2COLOR(0x000000), // text
HTML2COLOR(0x404040), // edge HTML2COLOR(0x404040), // edge
HTML2COLOR(0xE0E0E0), // fill HTML2COLOR(0xE0E0E0), // fill
HTML2COLOR(0xE0E0E0) // progress - inactive area HTML2COLOR(0x00E000) // progress - active area
}, },
// disabled color set // disabled color set
@ -66,7 +66,7 @@ const GWidgetStyle BlackWidgetStyle = {
HTML2COLOR(0xC0C0C0), // text HTML2COLOR(0xC0C0C0), // text
HTML2COLOR(0xC0C0C0), // edge HTML2COLOR(0xC0C0C0), // edge
HTML2COLOR(0x606060), // fill HTML2COLOR(0x606060), // fill
HTML2COLOR(0x404040) // progress - inactive area HTML2COLOR(0x008000) // progress - active area
}, },
// disabled color set // disabled color set

4
tools/studio/options_v2.json
View File

@ -317,7 +317,7 @@
{ {
"User": "", "User": "",
"Library": "", "Library": "",
"RGB": "0xE0E0E0" "RGB": "0x00E000"
} }
}, },
"Disabled": "Disabled":
@ -417,7 +417,7 @@
{ {
"User": "", "User": "",
"Library": "", "Library": "",
"RGB": "0x404040" "RGB": "0x008000"
} }
}, },
"Disabled": "Disabled":