From b3ba3c25ff044a666ac55b0e8913747fd298d0bb Mon Sep 17 00:00:00 2001 From: cxl Date: Mon, 10 Feb 2014 08:49:10 +0000 Subject: [PATCH] TURTLE: MouseWheel IE support git-svn-id: svn://ultimatepp.org/upp/trunk@6893 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Turtle/Server.cpp | 4 ++-- uppsrc/Turtle/Turtle.html | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/uppsrc/Turtle/Server.cpp b/uppsrc/Turtle/Server.cpp index f5e98752b..aa37eb4cd 100644 --- a/uppsrc/Turtle/Server.cpp +++ b/uppsrc/Turtle/Server.cpp @@ -40,6 +40,8 @@ int64 Ctrl::recieved_update_serial; Callback2 Ctrl::WhenConnect; Callback1 Ctrl::WhenTerminate; +StaticRect& DesktopRect(); + bool Ctrl::StartSession() { LLOG("Connect"); @@ -131,8 +133,6 @@ bool Ctrl::StartSession() #endif ChStdSkin(); - extern StaticRect& DesktopRect(); - DesktopRect().Color(Cyan()); DesktopRect().SetRect(0, 0, DesktopSize.cx, DesktopSize.cy); SetDesktop(Desktop()); diff --git a/uppsrc/Turtle/Turtle.html b/uppsrc/Turtle/Turtle.html index 263e9dae1..f26a1c547 100644 --- a/uppsrc/Turtle/Turtle.html +++ b/uppsrc/Turtle/Turtle.html @@ -471,11 +471,13 @@ canvas.onmouseup = function(event) event.preventDefault(); } -canvas.onwheel = function(event) +function MouseWheel(event) { event_queue += "W " + event.deltaY + mouse_event(event); } +canvas.addEventListener("wheel", MouseWheel); // IE9 needs addEventListener... + document.onkeydown = function(event) { event_queue += "K " + event.keyCode + " " + event.which + key_flags(event);