diff options
| author | Joel Bodenmann <joel@unormal.org> | 2013-04-05 16:17:59 +0200 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2013-04-05 16:17:59 +0200 |
| commit | 9842664b923099ad315872154d434a157614b4c2 (patch) | |
| tree | 1c2628cac2869e94ed6fe9246a0701a0784ca702 /src | |
| parent | c86cd58275c1efe62c6dd2f45e9996b077906352 (diff) | |
| download | uGFX-9842664b923099ad315872154d434a157614b4c2.tar.gz uGFX-9842664b923099ad315872154d434a157614b4c2.tar.bz2 uGFX-9842664b923099ad315872154d434a157614b4c2.zip | |
Revert "slider doc fix"
This reverts commit c86cd58275c1efe62c6dd2f45e9996b077906352.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ginput/mouse.c | 6 | ||||
| -rw-r--r-- | src/gwin/slider.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c index 1164e78b..4ad32359 100644 --- a/src/ginput/mouse.c +++ b/src/ginput/mouse.c @@ -339,7 +339,7 @@ GSourceHandle ginputGetMouse(uint16_t instance) { ginput_lld_mouse_init();
#if GINPUT_MOUSE_NEED_CALIBRATION
- #if 0
+ #if GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE
if (!MouseConfig.fnloadcal) {
MouseConfig.fnloadcal = ginput_lld_mouse_calibration_load;
MouseConfig.flags &= ~FLG_CAL_FREE;
@@ -548,11 +548,11 @@ void ginputSetMouseCalibrationRoutines(uint16_t instance, GMouseCalibrationSaveR MouseConfig.flags &= ~FLG_CAL_FREE;
#if GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE
if (!MouseConfig.fnloadcal) {
- MouseConfig.fnloadcal = fnload;
+ MouseConfig.fnloadcal = ginput_lld_mouse_calibration_load;
MouseConfig.flags &= ~FLG_CAL_FREE;
}
if (!MouseConfig.fnsavecal)
- MouseConfig.fnsavecal = fnsave;
+ MouseConfig.fnsavecal = ginput_lld_mouse_calibration_save;
#endif
if (MouseConfig.fnsavecal && (MouseConfig.flags & (FLG_CAL_OK|FLG_CAL_SAVED)) == FLG_CAL_OK) {
MouseConfig.fnsavecal(instance, (const uint8_t *)&MouseConfig.caldata, sizeof(MouseConfig.caldata));
diff --git a/src/gwin/slider.c b/src/gwin/slider.c index 040f7367..034ba6b2 100644 --- a/src/gwin/slider.c +++ b/src/gwin/slider.c @@ -74,7 +74,7 @@ static void gwinSliderCallback(void *param, GEvent *pe) { // We are tracking the mouse - // Test for slider up + // Test for button up if ((pme->meta & GMETA_MOUSE_UP)) { gsw->tracking = FALSE; @@ -104,7 +104,7 @@ static void gwinSliderCallback(void *param, GEvent *pe) { } // If mouse down - track movement - if ((pme->current_sliders & GINPUT_MOUSE_BTN_LEFT)) + if ((pme->current_buttons & GINPUT_MOUSE_BTN_LEFT)) trackSliderDraw(gh, pme->x-gh->x, pme->y-gh->y); return; |