summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Gavriliuk <alexandrgproductengine@lindenlab.com>2023-10-02 09:35:50 +0200
committerGuru <alexandrgproductengine@lindenlab.com>2023-10-02 09:49:15 +0200
commit317041be0dca02cf0667abad472db51fd7e69ded (patch)
treee54866855fd27e9568509ce92533e3b712c5850b
parentd551244bbe4763d4ac06a71cbeef93a889b3089e (diff)
SL-20356 Allow menu navigation by tabbing around emoji menu
-rw-r--r--indra/llui/llview.cpp2
-rw-r--r--indra/newview/skins/default/xui/en/floater_emoji_picker.xml1
2 files changed, 2 insertions, 1 deletions
diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 8716e6b338..a8eada59b2 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -514,7 +514,7 @@ BOOL LLView::focusNext(LLView::child_list_t & result)
{
next = result.rbegin();
}
- if((*next)->isCtrl())
+ if ((*next)->isCtrl() && ((LLUICtrl*)*next)->hasTabStop())
{
LLUICtrl * ctrl = static_cast<LLUICtrl*>(*next);
ctrl->setFocus(TRUE);
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
index d6774be65c..e15c304851 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -54,6 +54,7 @@
background_visible="true"
background_opaque="true"
bg_opaque_color="FrogGreen"
+ tab_stop="false"
bottom="0"
height="2"
width="20"