Used Universal Theme to fix QtQuick Controls

This commit is contained in:
Hamza ARBI 2022-10-24 13:50:41 +01:00
parent cc3d9e0d2d
commit cfff3c6d97
4 changed files with 9 additions and 3 deletions

View file

@ -9,6 +9,7 @@
#include "core/servercontroller.h" #include "core/servercontroller.h"
#include "debug.h" #include "debug.h"
#include "defines.h" #include "defines.h"
#include <QQuickStyle>
#include "platforms/ios/QRCodeReaderBase.h" #include "platforms/ios/QRCodeReaderBase.h"
@ -168,6 +169,8 @@ void AmneziaApplication::registerTypes()
void AmneziaApplication::loadFonts() void AmneziaApplication::loadFonts()
{ {
QQuickStyle::setStyle("Universal");
QFontDatabase::addApplicationFont(":/fonts/Lato-Black.ttf"); QFontDatabase::addApplicationFont(":/fonts/Lato-Black.ttf");
QFontDatabase::addApplicationFont(":/fonts/Lato-BlackItalic.ttf"); QFontDatabase::addApplicationFont(":/fonts/Lato-BlackItalic.ttf");
QFontDatabase::addApplicationFont(":/fonts/Lato-Bold.ttf"); QFontDatabase::addApplicationFont(":/fonts/Lato-Bold.ttf");

View file

@ -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 equals(QT_MAJOR_VERSION, 6): QT += core5compat
TARGET = AmneziaVPN TARGET = AmneziaVPN

View file

@ -3,8 +3,11 @@ import QtQuick.Controls
Button { Button {
id: root id: root
hoverEnabled: true
property bool containsMouse: hovered property bool containsMouse: hovered
hoverEnabled: true
flat: true
highlighted: false
MouseArea { MouseArea {
id: mouseArea id: mouseArea
anchors.fill: parent anchors.fill: parent

View file

@ -2,12 +2,12 @@ import QtQuick
import QtQuick.Window import QtQuick.Window
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import QtQuick.Controls.Material
import PageEnum 1.0 import PageEnum 1.0
import PageType 1.0 import PageType 1.0
import Qt.labs.platform import Qt.labs.platform
import Qt.labs.folderlistmodel import Qt.labs.folderlistmodel
import QtQuick.Dialogs import QtQuick.Dialogs
import QtQuick.Controls.Universal 2.12
import "./" import "./"
import "Controls" import "Controls"
import "Pages" import "Pages"