diff options
| author | Dave Houlton <euclid@lindenlab.com> | 2020-01-28 17:26:45 -0700 |
|---|---|---|
| committer | Dave Houlton <euclid@lindenlab.com> | 2020-01-28 17:26:45 -0700 |
| commit | 2a6b48c9b0c813c5e4ff8ac176fdf4e6c9466c22 (patch) | |
| tree | 7f608467b3608127049ddc78d5045da032777cb4 /indra/media_plugins/cef/media_plugin_cef.cpp | |
| parent | 3e44cb06df22dd1b684dc8574c3b44d0851527bc (diff) | |
| parent | 2998552f3d7447da316afdd1713595528596a0c5 (diff) | |
DRTVWR-440, merge in latest from 6.3.7 release
Diffstat (limited to 'indra/media_plugins/cef/media_plugin_cef.cpp')
| -rw-r--r-- | indra/media_plugins/cef/media_plugin_cef.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index d5a685e47f..cff21b13c4 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -660,12 +660,18 @@ void MediaPluginCEF::receiveMessage(const char* message_string) } else if (message_name == "scroll_event") { - S32 x = message_in.getValueS32("x"); - S32 y = message_in.getValueS32("y"); + // Mouse coordinates for cef to be able to scroll 'containers' + //S32 x = message_in.getValueS32("x"); + //S32 y = message_in.getValueS32("y"); + // Wheel's clicks + S32 delta_x = message_in.getValueS32("clicks_x"); + S32 delta_y = message_in.getValueS32("clicks_y"); const int scaling_factor = 40; - y *= -scaling_factor; + delta_x *= -scaling_factor; + delta_y *= -scaling_factor; - mCEFLib->mouseWheel(x, y); + // mCEFLib->mouseWheel(x, y, delta_x, delta_y); + mCEFLib->mouseWheel(delta_x, delta_y); } else if (message_name == "text_event") { |