aboutsummaryrefslogtreecommitdiffstats
path: root/gui
diff options
context:
space:
mode:
authortrsaunders <trsaunders@gmail.com>2012-07-24 17:22:50 +0100
committertrsaunders <trsaunders@gmail.com>2012-07-24 17:22:50 +0100
commite4094ad4681e2d73c1a22c60a7dd16835f9b7287 (patch)
tree8db74abf04b378191b7d036011b09ed32bb58ebc /gui
parent4ba0eb23a7d41a0f2afee3fd64b9ed56684bf865 (diff)
parent8d7a588c5185558fdc85da867a37ecf09026bb3c (diff)
downloaduGFX-e4094ad4681e2d73c1a22c60a7dd16835f9b7287.tar.gz
uGFX-e4094ad4681e2d73c1a22c60a7dd16835f9b7287.tar.bz2
uGFX-e4094ad4681e2d73c1a22c60a7dd16835f9b7287.zip
get pixel return value implemented in struct
Diffstat (limited to 'gui')
-rw-r--r--gui/gui.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/gui/gui.c b/gui/gui.c
index 3190a885..337a3f4b 100644
--- a/gui/gui.c
+++ b/gui/gui.c
@@ -89,7 +89,7 @@ static inline void buttonUpdate(struct guiNode_t *node) {
}
static inline void sliderUpdate(struct guiNode_t *node) {
- uint16_t length;
+ uint16_t length = 1;
if(node->orientation == horizontal)
length = node->x1 - node->x0;
@@ -113,8 +113,6 @@ static inline void sliderUpdate(struct guiNode_t *node) {
// a bit of safety here
if(node->percentage > 100)
node->percentage = 100;
- if(node->percentage < 0)
- node->percentage = 0;
if(node->orientation == horizontal) {
node->value = ((((node->x1)-(node->x0)) * node->percentage) / 100);
@@ -303,6 +301,11 @@ uint8_t guiDrawKeymatrix(uint16_t x0, uint16_t y0, uint16_t size, uint16_t space
return 0;
// lcdDraw functions
+ (void)size;
+ (void)space;
+ (void)buttonColor;
+ (void)fontColor;
+ (void)font;
chHeapFree(newNode);