Mercurial > hg > orthanc-stone
comparison Framework/Viewport/WebAssemblyViewport.cpp @ 1356:d8bb885e9b0a broker
Checking DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR
to control whether using DOM IDs or CSS selectors when
targeting DOM elements.
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Wed, 15 Apr 2020 14:54:04 +0200 |
| parents | 1b8e37770d78 |
| children | 30deba7bc8e2 |
comparison
equal
deleted
inserted
replaced
| 1355:4971b1c5dfa6 | 1356:d8bb885e9b0a |
|---|---|
| 209 { | 209 { |
| 210 compositor_.reset(compositor); | 210 compositor_.reset(compositor); |
| 211 } | 211 } |
| 212 } | 212 } |
| 213 | 213 |
| 214 #if DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR == 1 | |
| 215 // everything OK..... we're using the new setting | |
| 216 #else | |
| 217 #pragma message("WARNING: DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR is not defined or equal to 0. Stone will use the OLD Emscripten rules for DOM element selection.") | |
| 218 #endif | |
| 219 | |
| 214 WebAssemblyViewport::WebAssemblyViewport( | 220 WebAssemblyViewport::WebAssemblyViewport( |
| 215 const std::string& canvasId, bool enableEmscriptenMouseEvents) : | 221 const std::string& canvasId, bool enableEmscriptenMouseEvents) : |
| 216 canvasId_(canvasId), | 222 canvasId_(canvasId), |
| 223 #if DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR == 1 | |
| 217 canvasCssSelector_("#" + canvasId), | 224 canvasCssSelector_("#" + canvasId), |
| 225 #else | |
| 226 canvasCssSelector_(canvasId), | |
| 227 #endif | |
| 218 interactor_(new DefaultViewportInteractor), | 228 interactor_(new DefaultViewportInteractor), |
| 219 enableEmscriptenMouseEvents_(enableEmscriptenMouseEvents) | 229 enableEmscriptenMouseEvents_(enableEmscriptenMouseEvents) |
| 220 { | 230 { |
| 221 } | 231 } |
| 222 | 232 |