From 9386657955881bbe0b6bf7b531dab6fc0b4ae911 Mon Sep 17 00:00:00 2001
From: Angela Mazzurco <giangiasoc17@gmail.com>
Date: Wed, 6 Sep 2017 18:50:20 +0200
Subject: [PATCH] Fix horizontal scroll on category selection

---
 .../src/components/emoji/EmojiPicker.qml      | 47 +++++++++----------
 1 file changed, 23 insertions(+), 24 deletions(-)

diff --git a/retroshare-qml-app/src/components/emoji/EmojiPicker.qml b/retroshare-qml-app/src/components/emoji/EmojiPicker.qml
index 20c1072d1..e30b84322 100644
--- a/retroshare-qml-app/src/components/emoji/EmojiPicker.qml
+++ b/retroshare-qml-app/src/components/emoji/EmojiPicker.qml
@@ -100,38 +100,37 @@ Rectangle
 
 
     //seperator
+	Rectangle
+	{
+		color: "black"
+		anchors.bottom: parent.bottom
+		anchors.bottomMargin: buttonWidth
+		width: parent.width
+		height: 1
+	}
 	Rectangle
 	{
         color: emojiPicker.color
         anchors.bottom: parent.bottom
         width: parent.width
         height: buttonWidth
-    }
-	Rectangle
-	{
-        color: "black"
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: buttonWidth
-        width: parent.width
-        height: 1
-    }
 
-    //emoji category selector
-	ListView
-	{
-        width: parent.width
-        anchors.bottom: parent.bottom
-        anchors.bottomMargin: buttonWidth
-        orientation: ListView.Horizontal
-
-        model: emojiCategoryButtons
-		delegate: EmojiCategoryButton
+		//emoji category selector
+		ListView
 		{
-            width: buttonWidth
-            height: buttonWidth
-            color: emojiPicker.color
-			fontName: rootFontName
-        }
+			width: parent.width
+			orientation: ListView.Horizontal
+			anchors.fill: parent
+
+			model: emojiCategoryButtons
+			delegate: EmojiCategoryButton
+			{
+				width: buttonWidth
+				height: buttonWidth
+				color: emojiPicker.color
+				fontName: rootFontName
+			}
+		}
     }
 
 	ListModel