summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorAlexander Gavriliuk <alexandrgproductengine@lindenlab.com>2023-10-04 22:30:48 +0200
committerAlexander Gavriliuk <alexandrgproductengine@lindenlab.com>2023-10-05 12:10:34 +0200
commit9f8763cae1ccb3577a2cd148ffc5cee564a2df65 (patch)
tree0a9f2bfe2cc449d301821ec1152bc8aeacdd11a4 /indra/newview/skins/default
parent66aee79e3e9ca9b45e7c61d843caadb8469580e5 (diff)
SL-20402 Emoji Completion floater - use vertical scrollbar when needed
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/floater_emoji_complete.xml6
-rw-r--r--indra/newview/skins/default/xui/en/floater_im_session.xml2
-rw-r--r--indra/newview/skins/default/xui/en/widgets/emoji_complete.xml2
3 files changed, 7 insertions, 3 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_emoji_complete.xml b/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
index 207a8af118..d290d647e8 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_complete.xml
@@ -3,6 +3,8 @@
name="emoji_complete"
single_instance="true"
layout="topleft"
+ bg_opaque_image="Window_NoTitle_Foreground"
+ bg_alpha_image="Window_NoTitle_Background"
can_close="false"
can_dock="false"
can_drag_on_left="false"
@@ -11,6 +13,7 @@
can_tear_off="false"
header_height="0"
legacy_header_height="0"
+ show_title="false"
width="240"
height="40"
>
@@ -20,7 +23,8 @@
layout="topleft"
autosize="true"
vertical="true"
- max_emoji="7"
+ max_visible="7"
+ padding="4"
width="230"
height="30"
left="5"
diff --git a/indra/newview/skins/default/xui/en/floater_im_session.xml b/indra/newview/skins/default/xui/en/floater_im_session.xml
index fa65842c28..eb5d88bba6 100644
--- a/indra/newview/skins/default/xui/en/floater_im_session.xml
+++ b/indra/newview/skins/default/xui/en/floater_im_session.xml
@@ -353,7 +353,7 @@
name="emoji_recent_icons_ctrl"
follows="top|left|right"
layout="topleft"
- max_emoji="20"
+ max_visible="20"
top="0"
left="1"
right="-65"
diff --git a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
index f9db441815..6cc8d7118f 100644
--- a/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
+++ b/indra/newview/skins/default/xui/en/widgets/emoji_complete.xml
@@ -3,7 +3,7 @@
autosize="false"
hover_image="ListItem_Over"
selected_image="ListItem_Select"
- max_emoji="7"
+ max_visible="7"
padding="8"
>
</emoji_complete>