From c86cd58275c1efe62c6dd2f45e9996b077906352 Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Fri, 5 Apr 2013 16:15:07 +0200 Subject: slider doc fix --- src/ginput/mouse.c | 6 +++--- src/gwin/slider.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/ginput/mouse.c b/src/ginput/mouse.c index 4ad32359..1164e78b 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 GINPUT_MOUSE_LLD_CALIBRATION_LOADSAVE + #if 0 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 = ginput_lld_mouse_calibration_load; + MouseConfig.fnloadcal = fnload; MouseConfig.flags &= ~FLG_CAL_FREE; } if (!MouseConfig.fnsavecal) - MouseConfig.fnsavecal = ginput_lld_mouse_calibration_save; + MouseConfig.fnsavecal = fnsave; #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 034ba6b2..040f7367 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 button up + // Test for slider 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_buttons & GINPUT_MOUSE_BTN_LEFT)) + if ((pme->current_sliders & GINPUT_MOUSE_BTN_LEFT)) trackSliderDraw(gh, pme->x-gh->x, pme->y-gh->y); return; -- cgit v1.2.3