!

alamminsalo · Feb 27, 2016 · 13f80f6 · 13f80f6
1 parent 0a7958c
commit 13f80f6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/src/main.cpp b/src/main.cpp
@@ -17,6 +17,7 @@
 #include "systray.h"
 #include "customapp.h"
 #include "util/notificationmaker.h"
+#include <QProcessEnvironment>
 
 int main(int argc, char *argv[])
 {
@@ -44,17 +45,17 @@ int main(int argc, char *argv[])
 
     Power *power = new Power();
 
-    QQuickView view;
     QQmlApplicationEngine engine;
 
 #ifdef Q_OS_WIN
-    qreal dpiMultiplier = QGuiApplication::primaryScreen()->physicalDotsPerInch() * QGuiApplication::primaryScreen()->devicePixelRatio() / 96;
+    qreal dpiMultiplier = QGuiApplication::primaryScreen()->logicalDotsPerInch() / 96;
 
 #elif defined(Q_OS_LINUX)
-    qreal dpiMultiplier = QGuiApplication::primaryScreen()->physicalDotsPerInch() * QGuiApplication::primaryScreen()->devicePixelRatio() / 72;
+    qreal dpiMultiplier = QGuiApplication::primaryScreen()->logicalDotsPerInch() / 72;
+
 #endif
 
-    qDebug() <<"Multiplier: "<< dpiMultiplier;
+    qDebug() <<"DPI mult: "<< dpiMultiplier;
 
     qDebug() << "Setting context variables...";
     engine.rootContext()->setContextProperty("dpiMultiplier", dpiMultiplier);
@@ -70,9 +71,6 @@ int main(int argc, char *argv[])
     std::setlocale(LC_NUMERIC, "C");
     qmlRegisterType<MpvObject>("mpv", 1, 0, "MpvObject");
 
-   // QQmlComponent component(app.con, QUrl(QStringLiteral("qrc:/NotificationMaker.qml")));
-    //QObject *notificator = component.create();
-    //engine.load(QUrl("qrc:/NotificationMaker.qml"));
     engine.load(QUrl("qrc:/main.qml"));
 
     //Set up notifications

diff --git a/src/qml/main.qml b/src/qml/main.qml
@@ -8,8 +8,8 @@ import "style"
 ApplicationWindow {
     id: root
     visible: true
-    width: dp(1600)
-    height: dp(1200)
+    height: Screen.height * 0.8
+    width: height * 1.6
     title: "Orion"
     //flags: Qt.FramelessWindowHint | Qt.Window
     visibility: g_fullscreen ? "FullScreen" : "Windowed"

diff --git a/src/qml/style/Dpi.qml b/src/qml/style/Dpi.qml
@@ -7,8 +7,7 @@ Item {
     //readonly property real dpiMult: (6.192510402219141 / Screen.pixelDensity * Screen.devicePixelRatio)
 
     function scale(val){
-        //return val;
-        return Math.ceil(val * 0.666)
+        return Math.ceil(val * dpiMultiplier * .666)
     }
 
 }