From 73941f1ece5f55b822bebf8d3e7cab465478d8d1 Mon Sep 17 00:00:00 2001
From: RebeccaStankus <Rebecca@highfidelity.io>
Date: Fri, 16 Aug 2019 09:46:46 -0700
Subject: [PATCH] Fixed bug with emote indicator icon not restoring

---
 .../emojiApp/ui/qml/SimplifiedEmoji.qml           | 13 ++++++-------
 .../simplifiedEmote/simplifiedEmote.js            | 15 +++++++--------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml b/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml
index fb5015740d..9c49019ff2 100644
--- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml
+++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml
@@ -150,16 +150,15 @@ Rectangle {
         GridView {
             id: grid
             anchors.fill: parent
-            anchors.leftMargin: 14
-            anchors.rightMargin: 14
-            cellWidth: 40
-            cellHeight: 40
+            anchors.leftMargin: 30
+            anchors.rightMargin: 24
+            cellWidth: 60
+            cellHeight: 60
             model: filteredModel
             delegate: Image {
-                    width: 36
-                    height: 36
+                    width: 52
+                    height: 52
                     source: emoji36BaseURL + model.code.utf + ".png"
-                    fillMode: Image.Pad
                     MouseArea {
                         hoverEnabled: enabled
                         anchors.fill: parent
diff --git a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
index 59fb88e54b..6c6e60d567 100644
--- a/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
+++ b/scripts/simplifiedUI/simplifiedEmote/simplifiedEmote.js
@@ -140,6 +140,13 @@ function toggleReaction(reaction) {
         });
     } else {
         beginReactionWrapper(reaction);
+        emoteAppBarWindow.sendToQml({
+            "source": "simplifiedEmote.js",
+            "method": "updateEmoteIndicator",
+            "data": {
+                "icon": reaction
+            }
+        });
     }
 }
 
@@ -222,14 +229,6 @@ function onMessageFromEmoteAppBar(message) {
             console.log("Unrecognized message from " + EMOTE_APP_BAR_MESSAGE_SOURCE + ": " + JSON.stringify(message));
             break;
     }
-
-    emoteAppBarWindow.sendToQml({
-        "source": "simplifiedEmote.js",
-        "method": "updateEmoteIndicator",
-        "data": {
-            "icon": message.method
-        }
-    });
 }