From 2714ff8f25972c28d6667c83b834f189b0427f2d Mon Sep 17 00:00:00 2001 From: Andrey Kleshchev Date: Mon, 12 Feb 2018 19:27:09 +0000 Subject: MAINT-8276 Arrows 'Navigate back' and 'Navigate forward' have wrong state --- indra/media_plugins/cef/media_plugin_cef.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/media_plugins') diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index f3d7762a08..4dbee12ea0 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -194,6 +194,8 @@ void MediaPluginCEF::onTitleChangeCallback(std::string title) { LLPluginMessage message(LLPLUGIN_MESSAGE_CLASS_MEDIA, "name_text"); message.setValue("name", title); + message.setValueBoolean("history_back_available", mCEFLib->canGoBack()); + message.setValueBoolean("history_forward_available", mCEFLib->canGoForward()); sendMessage(message); } -- cgit v1.2.3 From 73ea789127a31ab82961cb3bdedd58d2353258af Mon Sep 17 00:00:00 2001 From: maxim_productengine Date: Fri, 16 Mar 2018 16:45:25 +0200 Subject: MAINT-8343 FIXED [MAC] Viewer Media Browser doubles entered Cyrillic capital letters. --- indra/media_plugins/cef/media_plugin_cef.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/media_plugins') diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 4dbee12ea0..0036250bb9 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -748,7 +748,7 @@ void MediaPluginCEF::keyEvent(dullahan::EKeyEvent key_event, LLSD native_key_dat // adding new code below in unicodeInput means we don't send ascii chars // here too or we get double key presses on a mac. - if (((unsigned char)event_chars < 0x20 || (unsigned char)event_chars >= 0x7f )) + if (((unsigned char)event_chars < 0x10 || (unsigned char)event_chars >= 0x7f )) { mCEFLib->nativeKeyboardEventOSX(key_event, event_modifiers, event_keycode, event_chars, -- cgit v1.2.3 From de9f589eecf39a4154727b25541a74d8f5f0948b Mon Sep 17 00:00:00 2001 From: Mnikolenko ProductEngine Date: Fri, 6 Apr 2018 17:34:22 +0300 Subject: MAINT-8501 FIXED [MAC] Web window doesn't close using 'ESC' button on the Login page. --- indra/media_plugins/cef/media_plugin_cef.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'indra/media_plugins') diff --git a/indra/media_plugins/cef/media_plugin_cef.cpp b/indra/media_plugins/cef/media_plugin_cef.cpp index 0036250bb9..18810f5794 100644 --- a/indra/media_plugins/cef/media_plugin_cef.cpp +++ b/indra/media_plugins/cef/media_plugin_cef.cpp @@ -747,8 +747,9 @@ void MediaPluginCEF::keyEvent(dullahan::EKeyEvent key_event, LLSD native_key_dat bool event_isrepeat = native_key_data["event_isrepeat"].asBoolean(); // adding new code below in unicodeInput means we don't send ascii chars - // here too or we get double key presses on a mac. - if (((unsigned char)event_chars < 0x10 || (unsigned char)event_chars >= 0x7f )) + // here too or we get double key presses on a mac. + bool esc_key = (event_umodchars == 27); + if (esc_key || ((unsigned char)event_chars < 0x10 || (unsigned char)event_chars >= 0x7f )) { mCEFLib->nativeKeyboardEventOSX(key_event, event_modifiers, event_keycode, event_chars, -- cgit v1.2.3