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/slider.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/slider.c')
| -rw-r--r-- | src/gwin/slider.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gwin/slider.c b/src/gwin/slider.c index 4c91ede6..3266e20a 100644 --- a/src/gwin/slider.c +++ b/src/gwin/slider.c @@ -74,7 +74,7 @@ static void ResetDisplayPos(GSliderObject *gsw) { if (x < 0 || x >= gh->width || y < 0 || y >= gh->height) { // No - restore the slider ResetDisplayPos(gsw); - _gwidgetRedraw(gh); + _gwidgetUpdate(gh); return; } #endif @@ -97,7 +97,7 @@ static void ResetDisplayPos(GSliderObject *gsw) { } ResetDisplayPos(gsw); - _gwidgetRedraw(gh); + _gwidgetUpdate(gh); // Generate the event SendSliderEvent(gw); @@ -127,7 +127,7 @@ static void ResetDisplayPos(GSliderObject *gsw) { } // Update the display - _gwidgetRedraw(&gw->g); + _gwidgetUpdate(&gw->g); #undef gsw } #endif @@ -169,7 +169,7 @@ static void ResetDisplayPos(GSliderObject *gsw) { gsw->pos = (uint16_t)((uint32_t)value*(gsw->max-gsw->min)/max + gsw->min); ResetDisplayPos(gsw); - _gwidgetRedraw((GHandle)gw); + _gwidgetUpdate((GHandle)gw); // Generate the event SendSliderEvent(gw); @@ -272,7 +272,7 @@ void gwinSliderSetPosition(GHandle gh, int pos) { else gsw->pos = pos; } ResetDisplayPos(gsw); - _gwidgetRedraw(gh); + _gwidgetUpdate(gh); #undef gsw } @@ -289,7 +289,7 @@ void gwinSliderDraw_Std(GWidgetObject *gw, void *param) { if (gw->g.vmt != (gwinVMT *)&sliderVMT) return; - if ((gw->g.flags & GWIN_FLG_ENABLED)) + if ((gw->g.flags & GWIN_FLG_SYSENABLED)) pcol = &gw->pstyle->pressed; else pcol = &gw->pstyle->disabled; @@ -334,7 +334,7 @@ void gwinSliderDraw_Image(GWidgetObject *gw, void *param) { if (gw->g.vmt != (gwinVMT *)&sliderVMT) return; - if ((gw->g.flags & GWIN_FLG_ENABLED)) + if ((gw->g.flags & GWIN_FLG_SYSENABLED)) pcol = &gw->pstyle->pressed; else pcol = &gw->pstyle->disabled; |