From 722d32a50c7d23e50a9768ac0c4c21e8ee44986d Mon Sep 17 00:00:00 2001
From: xiphon <xiphon@protonmail.com>
Date: Tue, 4 Dec 2018 19:17:44 +0000
Subject: [PATCH] wizard: fix flags hovering, cursor, layout

---
 wizard/WizardWelcome.qml | 62 ++++++++++++++++++++++++----------------
 1 file changed, 37 insertions(+), 25 deletions(-)

diff --git a/wizard/WizardWelcome.qml b/wizard/WizardWelcome.qml
index a124913f..39a75139 100644
--- a/wizard/WizardWelcome.qml
+++ b/wizard/WizardWelcome.qml
@@ -31,7 +31,7 @@ import QtQuick.XmlListModel 2.0
 import QtQuick.Layouts 1.1
 import QtQml 2.2
 
-
+import "../components" as MoneroComponents
 
 ColumnLayout {
 //    anchors.fill:parent
@@ -128,38 +128,50 @@ ColumnLayout {
 
             clip: true
 
-            delegate: ColumnLayout {
+            delegate: Item {
                 id: flagDelegate
+                height: gridView.cellHeight
                 width: gridView.cellWidth
-//                height: gridView.cellHeight
-//                Layout.alignment: Qt.AlignHCenter
-                Rectangle {
-                    id: flagRect
-                    width: 60 * scaleRatio; height: 60 * scaleRatio
-//                    anchors.centerIn: parent
-                    radius: 30 * scaleRatio
-                    Layout.alignment: Qt.AlignHCenter
-                    color: gridView.currentIndex === index ? "#DBDBDB" : "#FFFFFF"
-                    Image {
-                        anchors.fill: parent
-                        source: flag
+
+                ColumnLayout {
+                    width: gridView.cellWidth
+                    Rectangle {
+                        id: flagRect
+                        height: 60 * scaleRatio
+                        width: 60 * scaleRatio
+                        radius: 30 * scaleRatio
+                        Layout.alignment: Qt.AlignHCenter
+                        color: {
+                            if (gridView.currentIndex === index) {
+                                return MoneroComponents.Style.buttonBackgroundColor;
+                            } else if (delegateArea.containsMouse) {
+                                return MoneroComponents.Style.dimmedFontColor;
+                            } else {
+                                return MoneroComponents.Style.buttonTextColor;
+                            }
+                        }
+
+                        Image {
+                            anchors.fill: parent
+                            source: flag
+                        }
+                    }
+
+                    Text {
+                        font.family: "Arial"
+                        font.pixelSize: 18 * scaleRatio
+                        font.bold: gridView.currentIndex === index
+                        color: "#3F3F3F"
+                        text: display_name
+                        Layout.alignment: Qt.AlignHCenter
                     }
                 }
 
-                Text {
-                    font.family: "Arial"
-                    font.pixelSize: 18 * scaleRatio
-//                    anchors.horizontalCenter: parent.horizontalCenter
-                    font.bold: gridView.currentIndex === index
-//                    elide: Text.ElideRight
-                    color: "#3F3F3F"
-                    text: display_name
-//                    horizontalAlignment: Text.AlignHCenter
-                    Layout.alignment: Qt.AlignHCenter
-                }
                 MouseArea {
                     id: delegateArea
                     anchors.fill: parent
+                    cursorShape: Qt.PointingHandCursor
+                    hoverEnabled: true
                     onClicked:  {
                         gridView.currentIndex = index
                         var data = languagesModel.get(gridView.currentIndex);