From bc67241100ad3be2b61e4be70f29a9d466d51920 Mon Sep 17 00:00:00 2001
From: RebeccaStankus <Rebecca@highfidelity.io>
Date: Wed, 14 Aug 2019 14:09:48 -0700
Subject: [PATCH] Finished changes for CR feedback

---
 .../simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml     | 6 ++----
 scripts/simplifiedUI/ui/simplifiedUI.js                     | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
index aaec6cb9e8..10dfa99f09 100644
--- a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
+++ b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
@@ -52,7 +52,6 @@ Rectangle {
         onEntered: {
             Tablet.playSound(TabletEnums.ButtonHover);
             root.requestedWidth = root.hoveredWidth;
-            emoteButtonsRepeater.ItemAt(buttonsModel.count -1).buttonMouseArea.hoverEnabled = true;
         }
         onExited: {
             Tablet.playSound(TabletEnums.ButtonClick);
@@ -88,12 +87,11 @@ Rectangle {
         The main container of the actual buttons
     */
 
-    Rectangle {
+    Row {
         id: drawerContainer
         z: 1
-        color: simplifiedUI.colors.white
         anchors.top: parent.top
-        anchors.right: parent.right
+        leftPadding: root.originalWidth
         height: parent.height
         width: root.hoveredWidth
 
diff --git a/scripts/simplifiedUI/ui/simplifiedUI.js b/scripts/simplifiedUI/ui/simplifiedUI.js
index 686fb7752a..c145c09f22 100644
--- a/scripts/simplifiedUI/ui/simplifiedUI.js
+++ b/scripts/simplifiedUI/ui/simplifiedUI.js
@@ -372,7 +372,7 @@ function loadSimplifiedTopBar() {
         };
     } else {
         windowProps.position = {
-            x: 500,
+            x: Window.x,
             y: Window.y
         };
     }