From cfff3c6d970558219b4cd5df79cc539c586e8da7 Mon Sep 17 00:00:00 2001
From: Hamza ARBI <hamza.arbi.15@gmail.com>
Date: Mon, 24 Oct 2022 13:50:41 +0100
Subject: [PATCH] Used Universal Theme to fix QtQuick Controls

---
 client/amnezia_application.cpp             | 3 +++
 client/client.pro                          | 2 +-
 client/ui/qml/Controls/BasicButtonType.qml | 5 ++++-
 client/ui/qml/main.qml                     | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/client/amnezia_application.cpp b/client/amnezia_application.cpp
index 334582cb..734430fb 100644
--- a/client/amnezia_application.cpp
+++ b/client/amnezia_application.cpp
@@ -9,6 +9,7 @@
 #include "core/servercontroller.h"
 #include "debug.h"
 #include "defines.h"
+#include <QQuickStyle>
 
 #include "platforms/ios/QRCodeReaderBase.h"
 
@@ -168,6 +169,8 @@ void AmneziaApplication::registerTypes()
 
 void AmneziaApplication::loadFonts()
 {
+	QQuickStyle::setStyle("Universal");
+
     QFontDatabase::addApplicationFont(":/fonts/Lato-Black.ttf");
     QFontDatabase::addApplicationFont(":/fonts/Lato-BlackItalic.ttf");
     QFontDatabase::addApplicationFont(":/fonts/Lato-Bold.ttf");
diff --git a/client/client.pro b/client/client.pro
index 1ca71152..021cf80b 100644
--- a/client/client.pro
+++ b/client/client.pro
@@ -1,4 +1,4 @@
-QT += widgets core gui network xml remoteobjects quick svg
+QT += widgets core gui network xml remoteobjects quick svg quickcontrols2
 equals(QT_MAJOR_VERSION, 6): QT += core5compat
 
 TARGET = AmneziaVPN
diff --git a/client/ui/qml/Controls/BasicButtonType.qml b/client/ui/qml/Controls/BasicButtonType.qml
index f59ed329..e115df29 100644
--- a/client/ui/qml/Controls/BasicButtonType.qml
+++ b/client/ui/qml/Controls/BasicButtonType.qml
@@ -3,8 +3,11 @@ import QtQuick.Controls
 
 Button {
     id: root
-    hoverEnabled: true
     property bool containsMouse: hovered
+    hoverEnabled: true
+    flat: true
+    highlighted: false
+
     MouseArea {
         id: mouseArea
         anchors.fill: parent
diff --git a/client/ui/qml/main.qml b/client/ui/qml/main.qml
index a23c39aa..b076af7a 100644
--- a/client/ui/qml/main.qml
+++ b/client/ui/qml/main.qml
@@ -2,12 +2,12 @@ import QtQuick
 import QtQuick.Window
 import QtQuick.Controls
 import QtQuick.Layouts
-import QtQuick.Controls.Material
 import PageEnum 1.0
 import PageType 1.0
 import Qt.labs.platform
 import Qt.labs.folderlistmodel
 import QtQuick.Dialogs
+import QtQuick.Controls.Universal 2.12
 import "./"
 import "Controls"
 import "Pages"