livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIRE-33735: Option to suppress emoji chooser window from automatically popping up while typing in chat bars

master
PanteraPolnocy 2024-03-04 00:14:21 +01:00
parent 746bc58709
commit 5a0b671cc1
5 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
indra/llui/llemojihelper.cpp
View File

@ -57,6 +57,14 @@ bool LLEmojiHelper::isActive(const LLUICtrl* ctrl_p) const
// static
bool LLEmojiHelper::isCursorInEmojiCode(const LLWString& wtext, S32 cursorPos, S32* pShortCodePos)
{
// <FS:PP> FIRE-33735: Option to suppress emoji chooser window from automatically popping up while typing in chat bars
static LLCachedControl<bool> FSSuppressEmojiWindowPopupWhileTyping(*LLUI::getInstance()->mSettingGroups["config"], "FSSuppressEmojiWindowPopupWhileTyping");
if (FSSuppressEmojiWindowPopupWhileTyping)
{
return false;
}
// </FS:PP>
// If the cursor is currently on a colon start the check one character further back
S32 shortCodePos = (cursorPos == 0 || L':' != wtext[cursorPos - 1]) ? cursorPos : cursorPos - 1;

11
indra/newview/app_settings/settings.xml
View File

@ -26748,5 +26748,16 @@ Change of this parameter will affect the layout of buttons in notification toast
<key>Value</key>
<integer>1</integer>
</map>
<key>FSSuppressEmojiWindowPopupWhileTyping</key>
<map>
<key>Comment</key>
<string>Suppress emoji chooser window from automatically popping up while typing in chat bars.</string>
<key>Persist</key>
<integer>1</integer>
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
</map>
</map>
</llsd>

2
indra/newview/skins/default/xui/de/panel_preferences_chat.xml
View File

@ -147,8 +147,8 @@
<check_box label="Automatische Namensvorhersage in „Chat in der Nähe“-Eingabezeile aktivieren" name="FSChatbarNamePrediction"/>
<check_box name="AllowMUpose" label="„:“ als Synonym für &quot;/me&quot; verwenden"/>
<check_box name="AutoCloseOOC" label="((OOC))-Klammern automatisch schließen"/>
<check_box name="FSShowIMSendButton" label="Senden-Button in Eingabezeile für IM-Sitzungen anzeigen"/>
<check_box name="FSShowEmojiButton" label="Emoji-Button in Eingabezeile für Lokaler Chat IM-Sitzungen anzeigen"/>
<check_box name="FSShowIMSendButton" label="Senden-Button in Eingabezeile für IM-Sitzungen anzeigen"/>
<check_box name="FSNearbyChatbar" label="Eingabezeile zum Fenster Lokaler Chat hinzufügen"/>
<check_box name="FSShowChatChannel" label="Kanalauswahl in Eingabezeile anzeigen"/>
<check_box name="FSShowChatType" label="Chat-Typ/Senden-Button anzeigen"/>

14
indra/newview/skins/default/xui/en/panel_preferences_chat.xml
View File

@ -910,9 +910,9 @@
top_pad="1"
height="16"
width="400"
control_name="FSShowIMSendButton"
name="FSShowIMSendButton"
label="Show send chat button in chat bar for IM sessions"/>
control_name="FSSuppressEmojiWindowPopupWhileTyping"
name="FSSuppressEmojiWindowPopupWhileTyping"
label="Suppress emoji chooser window from automatically popping up while typing in chat bars"/>
<check_box
layout="topleft"
top_pad="1"
@ -921,6 +921,14 @@
control_name="FSShowEmojiButton"
name="FSShowEmojiButton"
label="Show emoji button in chat bar for IM sessions and Nearby Chat"/>
<check_box
layout="topleft"
top_pad="1"
height="16"
width="400"
control_name="FSShowIMSendButton"
name="FSShowIMSendButton"
label="Show send chat button in chat bar for IM sessions"/>
<check_box
layout="topleft"
top_pad="1"

3
indra/newview/skins/default/xui/pl/panel_preferences_chat.xml
View File

@ -141,8 +141,9 @@
<check_box label="Włącz automatyczne odgadywanie imion w pasku czatu w pobliżu" name="FSChatbarNamePrediction"/>
<check_box name="AllowMUpose" label="&quot;:&quot; synonimem dla &quot;/me&quot;"/>
<check_box name="AutoCloseOOC" label="Domykaj ((nawiasy)) dla czatu OOC"/>
<check_box name="FSShowIMSendButton" label="Pokaż przycisk wysyłania wiadomości w pasku czatu dla sesji IM"/>
<check_box name="FSSuppressEmojiWindowPopupWhileTyping" label="Wyłącz automatyczne wyświetlanie okna wyboru emoji podczas pisania w paskach czatu"/>
<check_box name="FSShowEmojiButton" label="Pokaż przycisk emoji w pasku czatu dla sesji IM i czatu w pobliżu"/>
<check_box name="FSShowIMSendButton" label="Pokaż przycisk wysyłania wiadomości w pasku czatu dla sesji IM"/>
<check_box name="FSNearbyChatbar" label="Dodaj pasek czatu do okna czatu w pobliżu"/>
<check_box name="FSShowChatChannel" label="Oferuj ręczny wybór kanału w pasku czatu"/>
<check_box name="FSShowChatType" label="Pokaż typ czatu i przycisk wysyłania"/>