diff options
| author | Alexander Gavriliuk <alexandrgproductengine@lindenlab.com> | 2023-07-04 07:38:05 +0200 |
|---|---|---|
| committer | Guru <alexandrgproductengine@lindenlab.com> | 2023-07-05 10:07:19 +0200 |
| commit | 8bbbce015b6dae1bdafe0bba329463322642ca85 (patch) | |
| tree | 82b01abfaad33f9bdd3586d50bf045c91b84953b /indra/newview/skins/default/xui | |
| parent | 886c6089672cc24a4ce5d2f84f388087e7d6281b (diff) | |
SL-19575 Rework emoji picker layout similar to Slack
Diffstat (limited to 'indra/newview/skins/default/xui')
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_activeim.xml | 2 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_emoji_picker.xml | 29 |
2 files changed, 29 insertions, 2 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_activeim.xml b/indra/newview/skins/default/xui/en/floater_activeim.xml index b79c5d9a19..42c3e7e935 100644 --- a/indra/newview/skins/default/xui/en/floater_activeim.xml +++ b/indra/newview/skins/default/xui/en/floater_activeim.xml @@ -23,7 +23,7 @@ <scrolling_panel_list follows="left|right" layout="topleft" - left="1" + left="1" name="chiclet_row_panel_list" width="318"/> </scroll_container> 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 000d779759..76cd1c6d2a 100644 --- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml +++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml @@ -20,6 +20,15 @@ left="34" height="29" width="162" /> + <text + name="Description" + layout="bottomleft" + follows="bottom|left|right" + font="SansSerifMedium" + bottom="14" + left="42" + height="29" + width="150" /> <button name="PreviewEmoji" layout="bottomleft" @@ -31,7 +40,7 @@ height="29" width="29" /> <scroll_list - name="Emojis" + name="EmojiList" layout="topleft" follows="all" sort_column="0" @@ -52,6 +61,24 @@ label="Name" name="name" /> </scroll_list> + <scroll_container + name="EmojiGridContainer" + layout="topleft" + follows="all" + top="25" + left="0" + height="330" + width="200"> + <scrolling_panel_list + name="EmojiGrid" + layout="topleft" + follows="top|left|right" + padding="4" + spacing="0" + top="0" + left="0" + width="200"/> + </scroll_container> <combo_box name="Category" label="Choose a category" |