diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-05-10 01:11:30 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-05-10 01:11:30 +1000 |
| commit | cb606359cccd09f00f27db93bb99fb06a3b49abd (patch) | |
| tree | 73ad7fd5a73ff43e3ba074a609cc2385372ee01c /src/gwin/button.c | |
| parent | 21aac3d8532c9aa1decab30c00d9f5a37067aa13 (diff) | |
| download | uGFX-cb606359cccd09f00f27db93bb99fb06a3b49abd.tar.gz uGFX-cb606359cccd09f00f27db93bb99fb06a3b49abd.tar.bz2 uGFX-cb606359cccd09f00f27db93bb99fb06a3b49abd.zip | |
Multiple changes to GWIN to support containers.
Diffstat (limited to 'src/gwin/button.c')
| -rw-r--r-- | src/gwin/button.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gwin/button.c b/src/gwin/button.c index f34e4ba3..da68d267 100644 --- a/src/gwin/button.c +++ b/src/gwin/button.c @@ -55,14 +55,14 @@ static void SendButtonEvent(GWidgetObject *gw) { static void MouseDown(GWidgetObject *gw, coord_t x, coord_t y) { (void) x; (void) y; gw->g.flags |= GBUTTON_FLG_PRESSED; - _gwidgetRedraw((GHandle)gw); + _gwidgetUpdate((GHandle)gw); } // A mouse up has occurred (it may or may not be over the button) static void MouseUp(GWidgetObject *gw, coord_t x, coord_t y) { (void) x; (void) y; gw->g.flags &= ~GBUTTON_FLG_PRESSED; - _gwidgetRedraw((GHandle)gw); + _gwidgetUpdate((GHandle)gw); #if !GWIN_BUTTON_LAZY_RELEASE // If the mouse up was not over the button then cancel the event @@ -79,14 +79,14 @@ static void SendButtonEvent(GWidgetObject *gw) { static void ToggleOff(GWidgetObject *gw, uint16_t role) { (void) role; gw->g.flags &= ~GBUTTON_FLG_PRESSED; - _gwidgetRedraw((GHandle)gw); + _gwidgetUpdate((GHandle)gw); } // A toggle on has occurred static void ToggleOn(GWidgetObject *gw, uint16_t role) { (void) role; gw->g.flags |= GBUTTON_FLG_PRESSED; - _gwidgetRedraw((GHandle)gw); + _gwidgetUpdate((GHandle)gw); // Trigger the event on button down (different than for mouse/touch) SendButtonEvent(gw); } @@ -161,7 +161,7 @@ bool_t gwinButtonIsPressed(GHandle gh) { *----------------------------------------------------------*/ static const GColorSet *getDrawColors(GWidgetObject *gw) { - if (!(gw->g.flags & GWIN_FLG_ENABLED)) return &gw->pstyle->disabled; + if (!(gw->g.flags & GWIN_FLG_SYSENABLED)) return &gw->pstyle->disabled; if ((gw->g.flags & GBUTTON_FLG_PRESSED)) return &gw->pstyle->pressed; return &gw->pstyle->enabled; } @@ -336,7 +336,7 @@ static const GColorSet *getDrawColors(GWidgetObject *gw) { if (gw->g.vmt != (gwinVMT *)&buttonVMT) return; pcol = getDrawColors(gw); - if (!(gw->g.flags & GWIN_FLG_ENABLED)) { + if (!(gw->g.flags & GWIN_FLG_SYSENABLED)) { sy = 2 * gw->g.height; } else if ((gw->g.flags & GBUTTON_FLG_PRESSED)) { sy = gw->g.height; |