From 94f5b258885c382078ec164d99dbbf3d1efb31c7 Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@hotmail.de>
Date: Mon, 30 Mar 2020 23:07:32 +0200
Subject: [PATCH] Change fallback style to fusion

---
 resources/qtquickcontrols2.conf |  2 ++
 resources/res.qrc               |  2 ++
 resources/styles/nheko-dark.qss | 18 +++++++-----------
 resources/styles/nheko.qss      | 12 ++----------
 4 files changed, 13 insertions(+), 21 deletions(-)
 create mode 100644 resources/qtquickcontrols2.conf

diff --git a/resources/qtquickcontrols2.conf b/resources/qtquickcontrols2.conf
new file mode 100644
index 00000000..d64f816e
--- /dev/null
+++ b/resources/qtquickcontrols2.conf
@@ -0,0 +1,2 @@
+[Controls]
+FallbackStyle=Fusion
diff --git a/resources/res.qrc b/resources/res.qrc
index 7080fdd6..c94f0f19 100644
--- a/resources/res.qrc
+++ b/resources/res.qrc
@@ -109,6 +109,8 @@
         <file>styles/nheko-dark.qss</file>
     </qresource>
     <qresource prefix="/">
+        <file>qtquickcontrols2.conf</file>
+
         <file>qml/TimelineView.qml</file>
         <file>qml/Avatar.qml</file>
         <file>qml/ImageButton.qml</file>
diff --git a/resources/styles/nheko-dark.qss b/resources/styles/nheko-dark.qss
index 74a23c59..d89a61bb 100644
--- a/resources/styles/nheko-dark.qss
+++ b/resources/styles/nheko-dark.qss
@@ -31,7 +31,6 @@ UserMentionsWidget > * {
 }
 
 QLineEdit,
-QListWidget,
 WelcomePage,
 LoginPage,
 RegisterPage,
@@ -160,7 +159,7 @@ CommunitiesListItem {
     qproperty-backgroundColor: #2d3139;
 
     qproperty-avatarBgColor: #202228;
-    qproperty-avatarFgColor: white;
+    qproperty-avatarFgColor: palette(window);
 }
 
 LoadingIndicator {
@@ -177,11 +176,9 @@ UserInfoWidget {
     border-bottom: 1px solid #202228;
 }
 
-QToolTip,
 QPushButton,
 QComboBox,
 QAbstractItemView,
-QMenu,
 QComboBox > * {
     background: white;
     color: #202228;
@@ -189,19 +186,13 @@ QComboBox > * {
 
 QComboBox:hover,
 QAbstractItemView::item:hover,
-QMenu::item:hover,
 QPushButton:hover {
     background: #38a3d8;
     selection-background-color: #38a3d8;
 }
 
 
-QMenu::item {
-    border: 1px solid transparent; /* reserve space for selection border */
-}
-
-QAbstractItemView::item:selected,
-QMenu::item:selected {
+QAbstractItemView::item:selected {
     border-color: darkblue;
     background: grey;
 }
@@ -267,6 +258,11 @@ Toggle {
     qproperty-trackColor: rgb(240, 240, 240);
 }
 
+QListWidget {
+    color: #caccd1;
+    background-color: #202228;
+}
+
 SnackBar {
     qproperty-textColor: #caccd1;
     qproperty-bgColor: #202228;
diff --git a/resources/styles/nheko.qss b/resources/styles/nheko.qss
index 2ccbdba9..1a7cb80f 100644
--- a/resources/styles/nheko.qss
+++ b/resources/styles/nheko.qss
@@ -183,7 +183,6 @@ TopSection {
 
 WelcomePage,
 LoginPage,
-QToolTip,
 QComboBox,
 QPushButton,
 RegisterPage {
@@ -191,22 +190,14 @@ RegisterPage {
     color: #333;
 }
 
-QMenu {
-    background-color: white;
-    color: #333;
-    border: 1px solid darkblue;
-}
-
 QComboBox:hover,
 QAbstractItemView::item:hover,
-QMenu::item:hover,
 QPushButton:hover {
     background: #38a3d8;
     selection-background-color: #38a3d8;
 }
 
-QAbstractItemView::item:selected,
-QMenu::item:selected {
+QAbstractItemView::item:selected {
     border-color: darkblue;
     background: grey;
 }
@@ -244,6 +235,7 @@ TextField {
     qproperty-labelColor: #333;
 }
 
+QListWidget,
 TextInputWidget,
 QTextEdit,
 QLineEdit {