From a3e2f9ebaa914bc873b1d5fdd670cb746beffa86 Mon Sep 17 00:00:00 2001
From: Victor Tran <vicr12345@gmail.com>
Date: Sat, 13 Oct 2018 16:37:23 +1100
Subject: Improved DPI scaling

---
 installer/maintainwindow.cpp | 10 +++++++++-
 installer/maintainwindow.ui  | 10 +++++-----
 installer/mainwindow.cpp     |  8 ++++++++
 installer/mainwindow.ui      | 14 +++++++-------
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/installer/maintainwindow.cpp b/installer/maintainwindow.cpp
index f5b8414..7072304 100644
--- a/installer/maintainwindow.cpp
+++ b/installer/maintainwindow.cpp
@@ -1,15 +1,23 @@
 #include "maintainwindow.h"
 #include "ui_maintainwindow.h"
 
+extern float getDPIScaling();
+
 MaintainWindow::MaintainWindow(QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::MaintainWindow)
 {
     ui->setupUi(this);
 
-    this->setFixedSize(this->size());
+    this->setFixedSize(this->size() * getDPIScaling());
     backgroundImage = QIcon(":/background.svg").pixmap(this->size());
 
+    ui->topSpacer1->changeSize(ui->topSpacer1->sizeHint().width(), ui->topSpacer1->sizeHint().height() * getDPIScaling(), QSizePolicy::Preferred, QSizePolicy::Fixed);
+    ui->topSpacer2->changeSize(ui->topSpacer2->sizeHint().width(), ui->topSpacer2->sizeHint().height() * getDPIScaling(), QSizePolicy::Preferred, QSizePolicy::Fixed);
+    ui->topSpacer3->changeSize(ui->topSpacer3->sizeHint().width(), ui->topSpacer3->sizeHint().height() * getDPIScaling(), QSizePolicy::Preferred, QSizePolicy::Fixed);
+    ui->topSpacer4->changeSize(ui->topSpacer4->sizeHint().width(), ui->topSpacer4->sizeHint().height() * getDPIScaling(), QSizePolicy::Preferred, QSizePolicy::Fixed);
+    ui->topSpacer5->changeSize(ui->topSpacer5->sizeHint().width(), ui->topSpacer5->sizeHint().height() * getDPIScaling(), QSizePolicy::Preferred, QSizePolicy::Fixed);
+
     taskbarButton = new QWinTaskbarButton(this);
 
     ui->performUninstallButton->setIcon(QApplication::style()->standardIcon(QStyle::SP_VistaShield));
diff --git a/installer/maintainwindow.ui b/installer/maintainwindow.ui
index 12b4259..a06f96a 100644
--- a/installer/maintainwindow.ui
+++ b/installer/maintainwindow.ui
@@ -39,7 +39,7 @@
       <widget class="QWidget" name="page">
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
-         <spacer name="verticalSpacer_2">
+         <spacer name="topSpacer1">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -119,7 +119,7 @@
       <widget class="QWidget" name="page_2">
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <item>
-         <spacer name="verticalSpacer_3">
+         <spacer name="topSpacer2">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -206,7 +206,7 @@
       <widget class="QWidget" name="page_3">
        <layout class="QVBoxLayout" name="verticalLayout_4">
         <item>
-         <spacer name="verticalSpacer_9">
+         <spacer name="topSpacer3">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -272,7 +272,7 @@
       <widget class="QWidget" name="page_4">
        <layout class="QVBoxLayout" name="verticalLayout_5">
         <item>
-         <spacer name="verticalSpacer_11">
+         <spacer name="topSpacer4">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -352,7 +352,7 @@
       <widget class="QWidget" name="page_5">
        <layout class="QVBoxLayout" name="verticalLayout_6">
         <item>
-         <spacer name="verticalSpacer_13">
+         <spacer name="topSpacer5">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
diff --git a/installer/mainwindow.cpp b/installer/mainwindow.cpp
index 4861544..46e8bee 100644
--- a/installer/mainwindow.cpp
+++ b/installer/mainwindow.cpp
@@ -16,6 +16,14 @@ MainWindow::MainWindow(QWidget *parent) :
     this->setFixedSize(this->size() * getDPIScaling());
     backgroundImage = QIcon(":/background.svg").pixmap(this->size());
 
+    ui->topSpacer1->changeSize(ui->topSpacer1->sizeHint().width(), ui->topSpacer1->sizeHint().height() * getDPIScaling(), QSizePolicy::Preferred, QSizePolicy::Fixed);
+    ui->topSpacer2->changeSize(ui->topSpacer2->sizeHint().width(), ui->topSpacer2->sizeHint().height() * getDPIScaling(), QSizePolicy::Preferred, QSizePolicy::Fixed);
+    ui->topSpacer3->changeSize(ui->topSpacer3->sizeHint().width(), ui->topSpacer3->sizeHint().height() * getDPIScaling(), QSizePolicy::Preferred, QSizePolicy::Fixed);
+    ui->topSpacer4->changeSize(ui->topSpacer4->sizeHint().width(), ui->topSpacer4->sizeHint().height() * getDPIScaling(), QSizePolicy::Preferred, QSizePolicy::Fixed);
+    ui->topSpacer5->changeSize(ui->topSpacer5->sizeHint().width(), ui->topSpacer5->sizeHint().height() * getDPIScaling(), QSizePolicy::Preferred, QSizePolicy::Fixed);
+    ui->topSpacer6->changeSize(ui->topSpacer6->sizeHint().width(), ui->topSpacer6->sizeHint().height() * getDPIScaling(), QSizePolicy::Preferred, QSizePolicy::Fixed);
+    ui->topSpacer7->changeSize(ui->topSpacer7->sizeHint().width(), ui->topSpacer7->sizeHint().height() * getDPIScaling(), QSizePolicy::Preferred, QSizePolicy::Fixed);
+
     taskbarButton = new QWinTaskbarButton(this);
 
     //ui->appIcon->setPixmap(QIcon(":/icon.svg").pixmap(128, 128));
diff --git a/installer/mainwindow.ui b/installer/mainwindow.ui
index d2e7103..59e1eda 100644
--- a/installer/mainwindow.ui
+++ b/installer/mainwindow.ui
@@ -39,7 +39,7 @@
       <widget class="QWidget" name="page_3">
        <layout class="QVBoxLayout" name="verticalLayout_5">
         <item>
-         <spacer name="verticalSpacer_5">
+         <spacer name="topSpacer1">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -82,7 +82,7 @@
       <widget class="QWidget" name="page_4">
        <layout class="QVBoxLayout" name="verticalLayout_6">
         <item>
-         <spacer name="verticalSpacer_7">
+         <spacer name="topSpacer2">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -184,7 +184,7 @@
       <widget class="QWidget" name="page">
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
-         <spacer name="verticalSpacer_2">
+         <spacer name="topSpacer3">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -299,7 +299,7 @@
       <widget class="QWidget" name="page_2">
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <item>
-         <spacer name="verticalSpacer_3">
+         <spacer name="topSpacer4">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -519,7 +519,7 @@
       <widget class="QWidget" name="page_5">
        <layout class="QVBoxLayout" name="verticalLayout_7">
         <item>
-         <spacer name="verticalSpacer_9">
+         <spacer name="topSpacer5">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -615,7 +615,7 @@
       <widget class="QWidget" name="page_6">
        <layout class="QVBoxLayout" name="verticalLayout_8">
         <item>
-         <spacer name="verticalSpacer_11">
+         <spacer name="topSpacer6">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
@@ -732,7 +732,7 @@
       <widget class="QWidget" name="page_7">
        <layout class="QVBoxLayout" name="verticalLayout_9">
         <item>
-         <spacer name="verticalSpacer_13">
+         <spacer name="topSpacer7">
           <property name="orientation">
            <enum>Qt::Vertical</enum>
           </property>
-- 
cgit v1.2.3