Mercurial > hg > orthanc-stone
comparison Samples/Deprecated/WebAssembly/BasicMPR.cpp @ 1370:28eb7106ef44 broker
Changes to GuiAdapter to allow it to work correctly with both new and old
Emscripten event selection rules that are defined by the DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR linker flag.
Doc has been added to GuiAdapter.cpp, should you require more info on
what has been done.
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Mon, 20 Apr 2020 13:08:43 +0200 |
parents | eac254fb6791 |
children |
comparison
equal
deleted
inserted
replaced
1369:aadc374bc006 | 1370:28eb7106ef44 |
---|---|
394 style->SetWindowing(OrthancStone::ImageWindowing_Bone); | 394 style->SetWindowing(OrthancStone::ImageWindowing_Bone); |
395 widget3_->SetSlicer(0, loader_, *loader_, style.release()); | 395 widget3_->SetSlicer(0, loader_, *loader_, style.release()); |
396 } | 396 } |
397 widget3_->UpdateSize(); | 397 widget3_->UpdateSize(); |
398 | 398 |
399 emscripten_set_resize_callback("#window", NULL, false, OnWindowResize); | 399 emscripten_set_resize_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, false, OnWindowResize); // DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=1 !! |
400 | 400 |
401 emscripten_set_wheel_callback("mycanvas1", widget1_.get(), false, OnMouseWheel); | 401 emscripten_set_wheel_callback("#mycanvas1", widget1_.get(), false, OnMouseWheel); |
402 emscripten_set_wheel_callback("mycanvas2", widget2_.get(), false, OnMouseWheel); | 402 emscripten_set_wheel_callback("#mycanvas2", widget2_.get(), false, OnMouseWheel); |
403 emscripten_set_wheel_callback("mycanvas3", widget3_.get(), false, OnMouseWheel); | 403 emscripten_set_wheel_callback("#mycanvas3", widget3_.get(), false, OnMouseWheel); |
404 | 404 |
405 emscripten_set_keydown_callback("#window", NULL, false, OnKeyDown); | 405 emscripten_set_keydown_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, false, OnKeyDown); |
406 emscripten_set_keyup_callback("#window", NULL, false, OnKeyUp); | 406 emscripten_set_keyup_callback(EMSCRIPTEN_EVENT_TARGET_WINDOW, NULL, false, OnKeyUp); |
407 | 407 |
408 emscripten_request_animation_frame_loop(OnAnimationFrame, NULL); | 408 emscripten_request_animation_frame_loop(OnAnimationFrame, NULL); |
409 | 409 |
410 | 410 |
411 std::string ct; | 411 std::string ct; |