Used Universal Theme to fix QtQuick Controls
This commit is contained in:
parent
cc3d9e0d2d
commit
cfff3c6d97
4 changed files with 9 additions and 3 deletions
|
|
@ -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");
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue