Merge pull request #798 from oflebbe/precise

RobLoach · web-flow · commit 171090c8e215 · 2025-04-21T17:24:23.000-06:00
fix: use precise mouse wheel info in demos
diff --git a/demo/rawfb/sdl/main.c b/demo/rawfb/sdl/main.c
@@ -216,8 +216,8 @@ int main(int argc, char **argv)
                     nk_input_button(&(context->ctx), sdl_button_to_nk(event.button.button), event.button.x, event.button.y,0);
                 break;
                 case SDL_MOUSEWHEEL:
-                    vec.x = event.wheel.x;
-                    vec.y = event.wheel.y;
+                    vec.x = event.wheel.preciseX;
+                    vec.y = event.wheel.preciseY;
                     nk_input_scroll(&(context->ctx), vec );
 
                 break;
diff --git a/demo/sdl_opengl2/nuklear_sdl_gl2.h b/demo/sdl_opengl2/nuklear_sdl_gl2.h
@@ -349,7 +349,7 @@ nk_sdl_handle_event(SDL_Event *evt)
             return 1;
 
         case SDL_MOUSEWHEEL:
-            nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y));
+            nk_input_scroll(ctx,nk_vec2(evt->wheel.preciseX, evt->wheel.preciseY));
             return 1;
     }
     return 0;
diff --git a/demo/sdl_opengl3/nuklear_sdl_gl3.h b/demo/sdl_opengl3/nuklear_sdl_gl3.h
@@ -459,7 +459,7 @@ nk_sdl_handle_event(SDL_Event *evt)
             return 1;
 
         case SDL_MOUSEWHEEL:
-            nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y));
+            nk_input_scroll(ctx,nk_vec2(evt->wheel.preciseX, evt->wheel.preciseY));
             return 1;
     }
     return 0;
diff --git a/demo/sdl_opengles2/nuklear_sdl_gles2.h b/demo/sdl_opengles2/nuklear_sdl_gles2.h
@@ -459,7 +459,7 @@ nk_sdl_handle_event(SDL_Event *evt)
             return 1;
 
         case SDL_MOUSEWHEEL:
-            nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y));
+            nk_input_scroll(ctx,nk_vec2(evt->wheel.preciseX, evt->wheel.preciseY));
             return 1;
     }
     return 0;
diff --git a/demo/sdl_renderer/nuklear_sdl_renderer.h b/demo/sdl_renderer/nuklear_sdl_renderer.h
@@ -382,7 +382,7 @@ nk_sdl_handle_event(SDL_Event *evt)
             return 1;
 
         case SDL_MOUSEWHEEL:
-            nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y));
+            nk_input_scroll(ctx,nk_vec2(evt->wheel.preciseX, evt->wheel.preciseY));
             return 1;
     }
     return 0;
diff --git a/demo/sdl_vulkan/nuklear_sdl_vulkan.h b/demo/sdl_vulkan/nuklear_sdl_vulkan.h
@@ -1382,7 +1382,7 @@ NK_API int nk_sdl_handle_event(SDL_Event *evt) {
     }
 
     case SDL_MOUSEWHEEL:
-        nk_input_scroll(ctx, nk_vec2((float)evt->wheel.x, (float)evt->wheel.y));
+        nk_input_scroll(ctx,nk_vec2(evt->wheel.preciseX, evt->wheel.preciseY));
         return 1;
     }
     return 0;
diff --git a/demo/sdl_vulkan/src/nuklear_sdl_vulkan.in.h b/demo/sdl_vulkan/src/nuklear_sdl_vulkan.in.h
@@ -1154,7 +1154,7 @@ NK_API int nk_sdl_handle_event(SDL_Event *evt) {
     }
 
     case SDL_MOUSEWHEEL:
-        nk_input_scroll(ctx, nk_vec2((float)evt->wheel.x, (float)evt->wheel.y));
+        nk_input_scroll(ctx,nk_vec2(evt->wheel.preciseX, evt->wheel.preciseY));
         return 1;
     }
     return 0;

Original file line number	Diff line number	Diff line change
`@@ -349,7 +349,7 @@ nk_sdl_handle_event(SDL_Event *evt)`
`349`	`349`	`return 1;`
`350`	`350`
`351`	`351`	`case SDL_MOUSEWHEEL:`
`352`		`- nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y));`
	`352`	`+ nk_input_scroll(ctx,nk_vec2(evt->wheel.preciseX, evt->wheel.preciseY));`
`353`	`353`	`return 1;`
`354`	`354`	`}`
`355`	`355`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -459,7 +459,7 @@ nk_sdl_handle_event(SDL_Event *evt)`
`459`	`459`	`return 1;`
`460`	`460`
`461`	`461`	`case SDL_MOUSEWHEEL:`
`462`		`- nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y));`
	`462`	`+ nk_input_scroll(ctx,nk_vec2(evt->wheel.preciseX, evt->wheel.preciseY));`
`463`	`463`	`return 1;`
`464`	`464`	`}`
`465`	`465`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -382,7 +382,7 @@ nk_sdl_handle_event(SDL_Event *evt)`
`382`	`382`	`return 1;`
`383`	`383`
`384`	`384`	`case SDL_MOUSEWHEEL:`
`385`		`- nk_input_scroll(ctx,nk_vec2((float)evt->wheel.x,(float)evt->wheel.y));`
	`385`	`+ nk_input_scroll(ctx,nk_vec2(evt->wheel.preciseX, evt->wheel.preciseY));`
`386`	`386`	`return 1;`
`387`	`387`	`}`
`388`	`388`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -1382,7 +1382,7 @@ NK_API int nk_sdl_handle_event(SDL_Event *evt) {`
`1382`	`1382`	`}`
`1383`	`1383`
`1384`	`1384`	`case SDL_MOUSEWHEEL:`
`1385`		`- nk_input_scroll(ctx, nk_vec2((float)evt->wheel.x, (float)evt->wheel.y));`
	`1385`	`+ nk_input_scroll(ctx,nk_vec2(evt->wheel.preciseX, evt->wheel.preciseY));`
`1386`	`1386`	`return 1;`
`1387`	`1387`	`}`
`1388`	`1388`	`return 0;`
Original file line number	Diff line number	Diff line change
`@@ -1154,7 +1154,7 @@ NK_API int nk_sdl_handle_event(SDL_Event *evt) {`
`1154`	`1154`	`}`
`1155`	`1155`
`1156`	`1156`	`case SDL_MOUSEWHEEL:`
`1157`		`- nk_input_scroll(ctx, nk_vec2((float)evt->wheel.x, (float)evt->wheel.y));`
	`1157`	`+ nk_input_scroll(ctx,nk_vec2(evt->wheel.preciseX, evt->wheel.preciseY));`
`1158`	`1158`	`return 1;`
`1159`	`1159`	`}`
`1160`	`1160`	`return 0;`