Commit edffd30b authored by Martin Straka's avatar Martin Straka

Material optimalization

parent a5c14e96
...@@ -28,9 +28,6 @@ import QtQuick.Controls 2.1 ...@@ -28,9 +28,6 @@ import QtQuick.Controls 2.1
/* /*
* Input dialog for password or OTP code. * Input dialog for password or OTP code.
*/ */
import QtQuick 2.7
import QtQuick.Controls 2.1
Dialog { Dialog {
id: root id: root
...@@ -63,6 +60,9 @@ Dialog { ...@@ -63,6 +60,9 @@ Dialog {
x: parent.width / 2 - width / 2 x: parent.width / 2 - width / 2
y: parent.height / 2 - height / 2 y: parent.height / 2 - height / 2
// show dialogue in 1/3 of vertical screen size (ios)
//y: parent.height / 2 - height
focus: true focus: true
modal: true modal: true
title: qsTr("QML input dialog") title: qsTr("QML input dialog")
......
...@@ -83,7 +83,7 @@ ApplicationWindow { ...@@ -83,7 +83,7 @@ ApplicationWindow {
property int headerHeight: textFontSizeInPixels * 3 property int headerHeight: textFontSizeInPixels * 3
property int imgHeight: headerHeight * 0.8 property int imgHeight: headerHeight * 0.8
// inputItemHeight holds height of controls elements computed from font size // inputItemHeight holds height of controls elements computed from font size
property int inputItemHeight: headerHeight * 0.8 property int inputItemHeight: headerHeight
property int navImgHeight: headerHeight * 0.3 property int navImgHeight: headerHeight * 0.3
property int listItemHeight: headerHeight * 1.5 property int listItemHeight: headerHeight * 1.5
property int defaultMargin: Math.round(Screen.pixelDensity) property int defaultMargin: Math.round(Screen.pixelDensity)
......
...@@ -186,7 +186,7 @@ Item { ...@@ -186,7 +186,7 @@ Item {
"msgType": msgType, "msgType": msgType,
"msgId": msgId, "msgId": msgId,
"messageModel": messageModel "messageModel": messageModel
}, StackView.Immediate) })
} }
} // MessageList } // MessageList
} // Item } // Item
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <QApplication> #include <QApplication>
#include <QCommandLineParser> #include <QCommandLineParser>
#include <QQmlApplicationEngine> #include <QQmlApplicationEngine>
#include <QQuickStyle>
#include <QSettings> #include <QSettings>
#include <QTranslator> #include <QTranslator>
#include <QtQuick> #include <QtQuick>
...@@ -169,8 +170,8 @@ void registerQmlTypes(const char *uri, const char *location, ...@@ -169,8 +170,8 @@ void registerQmlTypes(const char *uri, const char *location,
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
// Disable hiDPI and material QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
//QCoreApplication::setAttribute(Qt::AA_EnableHighDpiScaling); QQuickStyle::setStyle("Material");
//qputenv("QT_QUICK_CONTROLS_STYLE", "material"); //qputenv("QT_QUICK_CONTROLS_STYLE", "material");
/* First thing to create is the application object. */ /* First thing to create is the application object. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment