From ff7ebf08922293c1623b7bdb8c9923c14fc9db48 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 14 Apr 2023 07:44:56 +0200
Subject: SL-19575 Create emoji gallery access icon

---
 .../skins/default/xui/en/floater_emoji_picker.xml  | 39 ++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 indra/newview/skins/default/xui/en/floater_emoji_picker.xml

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

diff --git a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
new file mode 100644
index 0000000000..a3e504cc31
--- /dev/null
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
+<floater
+  name="emojipicker"
+  title="CHOOSE EMOJI"
+  help_topic="emojipicker"
+  positioning="cascading"
+  legacy_header_height="10"
+  can_resize="false"
+  layout="topleft"
+  height="419"
+  width="200">
+    <panel
+      label="Emojis"
+      name="EmojiPanel"
+      help_topic="emojipicker"
+      layout="topleft"
+      top="4"
+      left="2"
+      height="410"
+      width="196">
+      <scroll_list
+        draw_heading="true"
+        heading_height="28"
+        follows="all"
+        layout="topleft"
+        name="Emojis"
+        sort_column="0"
+		height="410">
+        <columns
+          label="Look"
+          name="look"
+          width="40" />
+		<columns
+          label="Name"
+          name="name"
+          width="150" />
+	  </scroll_list>
+    </panel>
+</floater>
-- 
cgit v1.2.3


From 97b0ba2a6d2596da867043077e32065653d44f6e Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Wed, 19 Apr 2023 01:39:42 +0200
Subject: SL-19575 LLFloaterEmojiPicker - Add filter by category

---
 .../skins/default/xui/en/floater_emoji_picker.xml  | 95 ++++++++++++++--------
 1 file changed, 60 insertions(+), 35 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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 a3e504cc31..831f7b6582 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -1,39 +1,64 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater
-  name="emojipicker"
-  title="CHOOSE EMOJI"
-  help_topic="emojipicker"
-  positioning="cascading"
-  legacy_header_height="10"
-  can_resize="false"
-  layout="topleft"
-  height="419"
-  width="200">
-    <panel
-      label="Emojis"
-      name="EmojiPanel"
-      help_topic="emojipicker"
+    name="emojipicker"
+    title="CHOOSE EMOJI"
+    help_topic="emojipicker"
+    positioning="cascading"
+    legacy_header_height="0"
+    can_resize="true"
+    layout="topleft"
+    height="400"
+    width="200">
+  <line_editor
+      name="Search"
+      layout="bottomleft"
+      follows="bottom|left|right"
+      text_tentative_color="TextFgTentativeColor"
+      max_length_bytes="63"
+      left_pad="5"
+	  bottom="14"
+	  left="34"
+      height="29"
+      width="162" />
+  <button
+	  name="PreviewEmoji"
+      layout="bottomleft"
+      follows="bottom|left"
+	  font="EmojiHuge"
+	  use_font_color="true"
+	  bottom="14"
+	  left="0"
+	  height="29"
+	  width="29" />
+  <scroll_list
+      name="Emojis"
       layout="topleft"
-      top="4"
-      left="2"
-      height="410"
-      width="196">
-      <scroll_list
-        draw_heading="true"
-        heading_height="28"
-        follows="all"
-        layout="topleft"
-        name="Emojis"
-        sort_column="0"
-		height="410">
-        <columns
-          label="Look"
-          name="look"
-          width="40" />
-		<columns
-          label="Name"
-          name="name"
-          width="150" />
-	  </scroll_list>
-    </panel>
+      follows="all"
+      sort_column="0"
+	  max_chars="63"
+	  commit_on_selection_change="true"
+      draw_heading="true"
+      heading_height="25"
+	  row_padding="0"
+	  top="25"
+	  height="330"
+	  width="200">
+    <columns
+        label="Look"
+        name="look"
+        width="40" />
+	<columns
+        label="Name"
+        name="name" />
+  </scroll_list>
+  <combo_box
+      name="Category"
+      layout="topleft"
+      follows="top|left|right"
+	  allow_text_entry="true"
+      left_pad="4"
+	  top="0"
+	  left="4"
+      height="27"
+      width="192" />
 </floater>
-- 
cgit v1.2.3


From c2eec5b100a7064f3c737db46f893864a8b29c3a Mon Sep 17 00:00:00 2001
From: Ansariel <ansariel.hiller@phoenixviewer.com>
Date: Sat, 22 Apr 2023 18:38:46 +0200
Subject: Don't hardcode UI text plus layout fixes and removing some needless
 checks

---
 .../skins/default/xui/en/floater_emoji_picker.xml  | 25 +++++++++++-----------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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 831f7b6582..f339c7428f 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -11,23 +11,23 @@
     width="200">
   <line_editor
       name="Search"
+      label="Type to search an emoji"
       layout="bottomleft"
       follows="bottom|left|right"
       text_tentative_color="TextFgTentativeColor"
       max_length_bytes="63"
-      left_pad="5"
-	  bottom="14"
-	  left="34"
+	  bottom="5"
+	  left="39"
       height="29"
-      width="162" />
+      width="158" />
   <button
 	  name="PreviewEmoji"
       layout="bottomleft"
       follows="bottom|left"
 	  font="EmojiHuge"
 	  use_font_color="true"
-	  bottom="14"
-	  left="0"
+	  bottom="5"
+	  left="5"
 	  height="29"
 	  width="29" />
   <scroll_list
@@ -39,26 +39,27 @@
 	  commit_on_selection_change="true"
       draw_heading="true"
       heading_height="25"
+	  left="5"
 	  row_padding="0"
 	  top="25"
-	  height="330"
-	  width="200">
+	  height="338"
+	  width="192">
     <columns
         label="Look"
         name="look"
-        width="40" />
+        width="50" />
 	<columns
         label="Name"
         name="name" />
   </scroll_list>
   <combo_box
       name="Category"
+      label="Choose a category"
       layout="topleft"
       follows="top|left|right"
 	  allow_text_entry="true"
-      left_pad="4"
 	  top="0"
-	  left="4"
-      height="27"
+	  left="5"
+      height="25"
       width="192" />
 </floater>
-- 
cgit v1.2.3


From fbf5b199f3bd9775bc992609baf6c093177a70d8 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 25 Apr 2023 00:44:25 +0200
Subject: SL-19575 LLFloaterEmojiPicker - code cleanup and layout fixup

---
 .../skins/default/xui/en/floater_emoji_picker.xml  | 50 +++++++++++-----------
 1 file changed, 25 insertions(+), 25 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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 f339c7428f..000d779759 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -11,44 +11,44 @@
     width="200">
   <line_editor
       name="Search"
-      label="Type to search an emoji"
+      label="Type to search"
       layout="bottomleft"
       follows="bottom|left|right"
       text_tentative_color="TextFgTentativeColor"
       max_length_bytes="63"
-	  bottom="5"
-	  left="39"
+      bottom="14"
+      left="34"
       height="29"
-      width="158" />
+      width="162" />
   <button
-	  name="PreviewEmoji"
+      name="PreviewEmoji"
       layout="bottomleft"
       follows="bottom|left"
-	  font="EmojiHuge"
-	  use_font_color="true"
-	  bottom="5"
-	  left="5"
-	  height="29"
-	  width="29" />
+      font="EmojiHuge"
+      use_font_color="true"
+      bottom="14"
+      left="2"
+      height="29"
+      width="29" />
   <scroll_list
       name="Emojis"
       layout="topleft"
       follows="all"
       sort_column="0"
-	  max_chars="63"
-	  commit_on_selection_change="true"
+      max_chars="63"
+      commit_on_selection_change="true"
       draw_heading="true"
       heading_height="25"
-	  left="5"
-	  row_padding="0"
-	  top="25"
-	  height="338"
-	  width="192">
+      row_padding="0"
+      top="25"
+      left="0"
+      height="330"
+      width="200">
     <columns
-        label="Look"
+        label="@"
         name="look"
-        width="50" />
-	<columns
+        width="16" />
+    <columns
         label="Name"
         name="name" />
   </scroll_list>
@@ -57,9 +57,9 @@
       label="Choose a category"
       layout="topleft"
       follows="top|left|right"
-	  allow_text_entry="true"
-	  top="0"
-	  left="5"
+      allow_text_entry="true"
+      top="0"
+      left="2"
       height="25"
-      width="192" />
+      width="196" />
 </floater>
-- 
cgit v1.2.3


From 8bbbce015b6dae1bdafe0bba329463322642ca85 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 4 Jul 2023 07:38:05 +0200
Subject: SL-19575 Rework emoji picker layout similar to Slack

---
 .../skins/default/xui/en/floater_emoji_picker.xml  | 29 +++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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"
-- 
cgit v1.2.3


From deb394e2075e031bfe1472fdc3bc638360683c85 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 6 Jul 2023 09:33:22 +0200
Subject: SL-19951 Delete unused UI elements (old design)

---
 .../skins/default/xui/en/floater_emoji_picker.xml  | 22 ----------------------
 1 file changed, 22 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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 76cd1c6d2a..2e153933c0 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -39,28 +39,6 @@
       left="2"
       height="29"
       width="29" />
-  <scroll_list
-      name="EmojiList"
-      layout="topleft"
-      follows="all"
-      sort_column="0"
-      max_chars="63"
-      commit_on_selection_change="true"
-      draw_heading="true"
-      heading_height="25"
-      row_padding="0"
-      top="25"
-      left="0"
-      height="330"
-      width="200">
-    <columns
-        label="@"
-        name="look"
-        width="16" />
-    <columns
-        label="Name"
-        name="name" />
-  </scroll_list>
   <scroll_container
       name="EmojiGridContainer"
       layout="topleft"
-- 
cgit v1.2.3


From 9793308a600c1e1ce35ec727ed6341e7668848ea Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 6 Jul 2023 23:48:06 +0200
Subject: SL-19951 Organize emoji categories in groups

---
 .../skins/default/xui/en/floater_emoji_picker.xml  | 33 ++++++++++++++--------
 1 file changed, 22 insertions(+), 11 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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 2e153933c0..2a534b23b9 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -7,8 +7,9 @@
     legacy_header_height="0"
     can_resize="true"
     layout="topleft"
+    min_width="250"
     height="400"
-    width="200">
+    width="250">
   <line_editor
       name="Search"
       label="Type to search"
@@ -19,7 +20,7 @@
       bottom="14"
       left="34"
       height="29"
-      width="162" />
+      width="212" />
   <text
       name="Description"
       layout="bottomleft"
@@ -28,7 +29,7 @@
       bottom="14"
       left="42"
       height="29"
-      width="150" />
+      width="200" />
   <button
       name="PreviewEmoji"
       layout="bottomleft"
@@ -46,7 +47,7 @@
       top="25"
       left="0"
       height="330"
-      width="200">
+      width="250">
     <scrolling_panel_list
         name="EmojiGrid"
         layout="topleft"
@@ -55,16 +56,26 @@
         spacing="0"
         top="0"
         left="0"
-        width="200"/>
+        width="250"/>
   </scroll_container>
-  <combo_box
-      name="Category"
-      label="Choose a category"
+  <panel
+      name="Groups"
       layout="topleft"
       follows="top|left|right"
-      allow_text_entry="true"
       top="0"
-      left="2"
+      left="0"
       height="25"
-      width="196" />
+      width="250">
+    <panel
+      name="Badge"
+      layout="bottomleft"
+      follows="bottom|left"
+      background_visible="true"
+      background_opaque="true"
+      bg_opaque_color="FrogGreen"
+      bottom="0"
+      height="2"
+      width="20"
+      />
+  </panel>
 </floater>
-- 
cgit v1.2.3


From 16f0329d184f62437c296483143aef72f1aaa284 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Fri, 7 Jul 2023 23:35:01 +0200
Subject: SL-19951 Collect used icons in a special group 'Recently used'

---
 indra/newview/skins/default/xui/en/floater_emoji_picker.xml | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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 2a534b23b9..4b4bf0c5a3 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -10,6 +10,8 @@
     min_width="250"
     height="400"
     width="250">
+  <floater.string name="title_for_recently_used" value="Recently used"/>
+  <floater.string name="title_for_frequently_used" value="Frequently used"/>
   <line_editor
       name="Search"
       label="Type to search"
-- 
cgit v1.2.3


From 1fe007abef6eeceefb0dc720b4a5ecb4505ede88 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Thu, 13 Jul 2023 21:18:22 +0200
Subject: SL-20001 EmojiPicker - make the preview to be a panel instead of a
 button

---
 .../skins/default/xui/en/floater_emoji_picker.xml  | 32 ++++++----------------
 1 file changed, 8 insertions(+), 24 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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 4b4bf0c5a3..a2a290c306 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -13,42 +13,26 @@
   <floater.string name="title_for_recently_used" value="Recently used"/>
   <floater.string name="title_for_frequently_used" value="Frequently used"/>
   <line_editor
-      name="Search"
-      label="Type to search"
+      name="Filter"
+      label="Start typing to filter"
       layout="bottomleft"
       follows="bottom|left|right"
       text_tentative_color="TextFgTentativeColor"
+      show_label_focused="true"
       max_length_bytes="63"
+      text_pad_right="5"
+      text_pad_left="5"
       bottom="14"
-      left="34"
+      left="10"
       height="29"
-      width="212" />
-  <text
-      name="Description"
-      layout="bottomleft"
-      follows="bottom|left|right"
-      font="SansSerifMedium"
-      bottom="14"
-      left="42"
-      height="29"
-      width="200" />
-  <button
-      name="PreviewEmoji"
-      layout="bottomleft"
-      follows="bottom|left"
-      font="EmojiHuge"
-      use_font_color="true"
-      bottom="14"
-      left="2"
-      height="29"
-      width="29" />
+      width="230" />
   <scroll_container
       name="EmojiGridContainer"
       layout="topleft"
       follows="all"
       top="25"
       left="0"
-      height="330"
+      height="325"
       width="250">
     <scrolling_panel_list
         name="EmojiGrid"
-- 
cgit v1.2.3


From 031032fb892560a0f5fa1a996aea77f593f54704 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 29 Aug 2023 13:12:09 +0200
Subject: SL-20211 EmojiPicker - The search field should be the same as other
 floaters

---
 indra/newview/skins/default/xui/en/floater_emoji_picker.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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 a2a290c306..6c440de573 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -12,19 +12,14 @@
     width="250">
   <floater.string name="title_for_recently_used" value="Recently used"/>
   <floater.string name="title_for_frequently_used" value="Frequently used"/>
-  <line_editor
+  <filter_editor
       name="Filter"
       label="Start typing to filter"
       layout="bottomleft"
       follows="bottom|left|right"
-      text_tentative_color="TextFgTentativeColor"
-      show_label_focused="true"
-      max_length_bytes="63"
-      text_pad_right="5"
-      text_pad_left="5"
       bottom="14"
       left="10"
-      height="29"
+      height="23"
       width="230" />
   <scroll_container
       name="EmojiGridContainer"
-- 
cgit v1.2.3


From 771d409b08eb6073f87aee25a95c242d8178d705 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Sat, 16 Sep 2023 16:09:25 +0200
Subject: SL-20211 EmojiPicker - Move the filter field to the top of the
 floater

---
 .../skins/default/xui/en/floater_emoji_picker.xml   | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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 6c440de573..d6774be65c 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -15,9 +15,9 @@
   <filter_editor
       name="Filter"
       label="Start typing to filter"
-      layout="bottomleft"
-      follows="bottom|left|right"
-      bottom="14"
+      layout="topleft"
+      follows="top|left|right"
+      top="27"
       left="10"
       height="23"
       width="230" />
@@ -25,9 +25,9 @@
       name="EmojiGridContainer"
       layout="topleft"
       follows="all"
-      top="25"
+      top="50"
       left="0"
-      height="325"
+      height="300"
       width="250">
     <scrolling_panel_list
         name="EmojiGrid"
@@ -59,4 +59,15 @@
       width="20"
       />
   </panel>
+  <text
+      name="Dummy"
+      type="string"
+      layout="bottomleft"
+      follows="bottom|left|right"
+      halign="center"
+      valign="center"
+      bottom="14"
+      left="10"
+      height="23"
+      width="230">No emoji selected</text>
 </floater>
-- 
cgit v1.2.3


From 317041be0dca02cf0667abad472db51fd7e69ded Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 2 Oct 2023 09:35:50 +0200
Subject: SL-20356 Allow menu navigation by tabbing around emoji menu

---
 indra/newview/skins/default/xui/en/floater_emoji_picker.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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"
-- 
cgit v1.2.3


From 716b9af35d0dbc3ba8048a1bcca2c8c8f703bed0 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Tue, 7 Nov 2023 23:13:00 +0100
Subject: SL-20356 EmojiPicker - Implement arrow keys navigation

---
 indra/newview/skins/default/xui/en/floater_emoji_picker.xml | 1 +
 1 file changed, 1 insertion(+)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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 e15c304851..a89d97d8e9 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -25,6 +25,7 @@
       name="EmojiGridContainer"
       layout="topleft"
       follows="all"
+      ignore_arrow_keys="true"
       top="50"
       left="0"
       height="300"
-- 
cgit v1.2.3


From f6ceafee5bb26cf86d64959cabf68deefaf791a8 Mon Sep 17 00:00:00 2001
From: Alexander Gavriliuk <alexandrgproductengine@lindenlab.com>
Date: Mon, 22 Jan 2024 06:40:41 +0100
Subject: SL-20416 Avoid of taking focus by EmojiPicker

---
 .../skins/default/xui/en/floater_emoji_picker.xml  | 34 ++++++++--------------
 1 file changed, 12 insertions(+), 22 deletions(-)

(limited to 'indra/newview/skins/default/xui/en/floater_emoji_picker.xml')

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 a89d97d8e9..d21f8c82bc 100644
--- a/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
+++ b/indra/newview/skins/default/xui/en/floater_emoji_picker.xml
@@ -3,33 +3,26 @@
     name="emojipicker"
     title="CHOOSE EMOJI"
     help_topic="emojipicker"
-    positioning="cascading"
-    legacy_header_height="0"
+    single_instance="true"
+    can_minimize="false"
+    can_tear_off="false"
     can_resize="true"
+    auto_close="true"
     layout="topleft"
     min_width="250"
-    height="400"
-    width="250">
+    chrome="true"
+    height="350"
+    width="304">
   <floater.string name="title_for_recently_used" value="Recently used"/>
   <floater.string name="title_for_frequently_used" value="Frequently used"/>
-  <filter_editor
-      name="Filter"
-      label="Start typing to filter"
-      layout="topleft"
-      follows="top|left|right"
-      top="27"
-      left="10"
-      height="23"
-      width="230" />
   <scroll_container
       name="EmojiGridContainer"
       layout="topleft"
       follows="all"
       ignore_arrow_keys="true"
-      top="50"
+      top="25"
       left="0"
-      height="300"
-      width="250">
+      height="275">
     <scrolling_panel_list
         name="EmojiGrid"
         layout="topleft"
@@ -37,8 +30,7 @@
         padding="4"
         spacing="0"
         top="0"
-        left="0"
-        width="250"/>
+        left="0"/>
   </scroll_container>
   <panel
       name="Groups"
@@ -46,8 +38,7 @@
       follows="top|left|right"
       top="0"
       left="0"
-      height="25"
-      width="250">
+      height="25">
     <panel
       name="Badge"
       layout="bottomleft"
@@ -70,6 +61,5 @@
       valign="center"
       bottom="14"
       left="10"
-      height="23"
-      width="230">No emoji selected</text>
+      height="25">No emoji selected</text>
 </floater>
-- 
cgit v1.2.3