diff options
| author | Kitty Barnett <develop@catznip.com> | 2022-11-09 22:55:29 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2022-11-09 23:25:02 +0100 |
| commit | 7ebaa2d2e55c6a9b7feeb684190628e340ad7920 (patch) | |
| tree | 506c00c18a41846d77f171fa4940c534cabf9060 /indra/llui/lltexteditor.h | |
| parent | 6e79ca4959d98c0305ff1c158b5402f56aba5430 (diff) | |
| parent | b5033a8859b38df045cc74e074aaee864985f145 (diff) | |
Merge branch contribution/emoji into DRTVWR-489-emoji
Diffstat (limited to 'indra/llui/lltexteditor.h')
| -rw-r--r-- | indra/llui/lltexteditor.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/indra/llui/lltexteditor.h b/indra/llui/lltexteditor.h index 1a10d2fd1e..f7621b39f0 100644 --- a/indra/llui/lltexteditor.h +++ b/indra/llui/lltexteditor.h @@ -60,6 +60,7 @@ public: ignore_tab, commit_on_focus_lost, show_context_menu, + show_emoji_helper, enable_tooltip_paste, auto_indent; @@ -91,6 +92,8 @@ public: static S32 spacesPerTab(); + void handleEmojiCommit(const LLWString& wstr); + // mousehandler overrides virtual BOOL handleMouseDown(S32 x, S32 y, MASK mask); virtual BOOL handleMouseUp(S32 x, S32 y, MASK mask); @@ -202,6 +205,9 @@ public: void setShowContextMenu(bool show) { mShowContextMenu = show; } bool getShowContextMenu() const { return mShowContextMenu; } + void setShowEmojiHelper(bool show); + bool getShowEmojiHelper() const { return mShowEmojiHelper; } + void setPassDelete(BOOL b) { mPassDelete = b; } protected: @@ -318,6 +324,7 @@ private: BOOL mAllowEmbeddedItems; bool mShowContextMenu; + bool mShowEmojiHelper; bool mEnableTooltipPaste; bool mPassDelete; bool mKeepSelectionOnReturn; // disabling of removing selected text after pressing of Enter |