From 2555eec8aa3d901f90a19ddd1ccbfbf05fae6960 Mon Sep 17 00:00:00 2001
From: Richard Ramos <info@richardramos.me>
Date: Wed, 27 May 2020 22:26:01 -0400
Subject: [PATCH] fix: menu styling

---
 ui/app/AppLayouts/Chat/ContactsColumn.qml             | 1 +
 ui/app/AppLayouts/Chat/components/PublicChatPopup.qml | 6 +++---
 ui/shared/PopupMenu.qml                               | 3 +++
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/ui/app/AppLayouts/Chat/ContactsColumn.qml b/ui/app/AppLayouts/Chat/ContactsColumn.qml
index 1ab2042cd5..c54437c26d 100644
--- a/ui/app/AppLayouts/Chat/ContactsColumn.qml
+++ b/ui/app/AppLayouts/Chat/ContactsColumn.qml
@@ -143,6 +143,7 @@ Item {
         MouseArea {
             anchors.fill: parent
             acceptedButtons: Qt.LeftButton | Qt.RightButton
+            cursorShape: Qt.PointingHandCursor
             onClicked: {
                 addChatLbl.state = "rotated"
                 let x = addChatLbl.x + addChatLbl.width / 2 - newChatMenu.width / 2
diff --git a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
index 7c387b6291..b71e7830e6 100644
--- a/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
+++ b/ui/app/AppLayouts/Chat/components/PublicChatPopup.qml
@@ -188,9 +188,9 @@ Item {
                 anchors.fill: parent
                 onClicked : {
                     if(channelName.text === "") return;
-
-                    chatsModel.joinChat(channelName.text)
-                    popup.close()
+                    chatsModel.joinChat(channelName.text);
+                    channelName.text = "";
+                    popup.close();
                 }
             }
         }
diff --git a/ui/shared/PopupMenu.qml b/ui/shared/PopupMenu.qml
index 034092e062..31eaabdc4e 100644
--- a/ui/shared/PopupMenu.qml
+++ b/ui/shared/PopupMenu.qml
@@ -19,7 +19,9 @@ Menu {
             Item {
                 id: menuIcon
                 anchors.left: parent.left
+                anchors.top: parent.top
                 anchors.leftMargin: 12
+                anchors.topMargin: 4
                 Image {
                     fillMode: Image.Pad
                     id: popupMenuItemIcon
@@ -38,6 +40,7 @@ Menu {
             Text {
                 anchors.left: menuIcon.right
                 anchors.leftMargin: 32
+                topPadding: 4
                 text: popupMenuItem.text
                 font: popupMenuItem.font
                 color: popupMenuItem.highlighted ? Theme.white : Theme.black