From 3db1c43fd6264e19328ad37a560175b3db975903 Mon Sep 17 00:00:00 2001 From: Pengfei Date: Sun, 27 Jun 2021 18:46:08 +0800 Subject: [PATCH] Changes to accommodate for high DPI Not sure how this will work on Linux or macOS. --- src/frontend/import_dialog.cpp | 5 +++++ src/frontend/import_dialog.ui | 4 ++-- src/frontend/main.cpp | 4 ++++ src/frontend/main.ui | 17 ++--------------- src/frontend/select_files_dialog.cpp | 4 ++++ src/frontend/select_files_dialog.ui | 4 ++-- src/frontend/utilities.cpp | 4 ++++ src/frontend/utilities.ui | 4 ++-- 8 files changed, 25 insertions(+), 21 deletions(-) diff --git a/src/frontend/import_dialog.cpp b/src/frontend/import_dialog.cpp index 9bcc18e..f38cd44 100644 --- a/src/frontend/import_dialog.cpp +++ b/src/frontend/import_dialog.cpp @@ -6,6 +6,7 @@ #include #include #include +#include #include #include #include @@ -94,6 +95,10 @@ ImportDialog::ImportDialog(QWidget* parent, const Core::Config& config) qRegisterMetaType(); ui->setupUi(this); + + const double scale = qApp->desktop()->logicalDpiX() / 96.0; + resize(static_cast(width() * scale), static_cast(height() * scale)); + if (!importer.IsGood()) { QMessageBox::critical( this, tr("Importer Error"), diff --git a/src/frontend/import_dialog.ui b/src/frontend/import_dialog.ui index 1ffd771..196dcdc 100644 --- a/src/frontend/import_dialog.ui +++ b/src/frontend/import_dialog.ui @@ -6,8 +6,8 @@ 0 0 - 700 - 400 + 560 + 320 diff --git a/src/frontend/main.cpp b/src/frontend/main.cpp index 2d6c300..cd52960 100644 --- a/src/frontend/main.cpp +++ b/src/frontend/main.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include #include #include @@ -38,6 +39,9 @@ bool IsConfigGood(const Core::Config& config) { MainDialog::MainDialog(QWidget* parent) : QDialog(parent), ui(std::make_unique()) { ui->setupUi(this); + const double scale = qApp->desktop()->logicalDpiX() / 96.0; + resize(static_cast(width() * scale), static_cast(height() * scale)); + ui->buttonBox->button(QDialogButtonBox::StandardButton::Ok)->setEnabled(false); ui->buttonBox->button(QDialogButtonBox::StandardButton::Reset)->setText(tr("Refresh")); diff --git a/src/frontend/main.ui b/src/frontend/main.ui index 00c3c99..51dd96f 100644 --- a/src/frontend/main.ui +++ b/src/frontend/main.ui @@ -6,8 +6,8 @@ 0 0 - 800 - 320 + 640 + 256 @@ -79,19 +79,6 @@ - - - - Qt::Vertical - - - - 0 - 0 - - - - diff --git a/src/frontend/select_files_dialog.cpp b/src/frontend/select_files_dialog.cpp index 107f881..c32d88a 100644 --- a/src/frontend/select_files_dialog.cpp +++ b/src/frontend/select_files_dialog.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include "frontend/select_files_dialog.h" @@ -13,6 +14,9 @@ SelectFilesDialog::SelectFilesDialog(QWidget* parent, bool source_is_dir_, bool ui->setupUi(this); + const double scale = qApp->desktop()->logicalDpiX() / 96.0; + resize(static_cast(width() * scale), static_cast(height() * scale)); + connect(ui->buttonBox, &QDialogButtonBox::accepted, [this] { if (ui->source->text().isEmpty() || ui->destination->text().isEmpty()) { QMessageBox::warning(this, tr("Warning"), tr("Please fill in all the fields.")); diff --git a/src/frontend/select_files_dialog.ui b/src/frontend/select_files_dialog.ui index 412cbbd..9436e0a 100644 --- a/src/frontend/select_files_dialog.ui +++ b/src/frontend/select_files_dialog.ui @@ -6,8 +6,8 @@ 0 0 - 600 - 120 + 480 + 96 diff --git a/src/frontend/utilities.cpp b/src/frontend/utilities.cpp index b879ace..d3bb661 100644 --- a/src/frontend/utilities.cpp +++ b/src/frontend/utilities.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include #include @@ -21,6 +22,9 @@ UtilitiesDialog::UtilitiesDialog(QWidget* parent) ui->setupUi(this); + const double scale = qApp->desktop()->logicalDpiX() / 96.0; + resize(static_cast(width() * scale), static_cast(height() * scale)); + connect(ui->useSdDecryption, &QCheckBox::clicked, [this] { const bool checked = ui->useSdDecryption->isChecked(); diff --git a/src/frontend/utilities.ui b/src/frontend/utilities.ui index 6fa7e14..a7eead6 100644 --- a/src/frontend/utilities.ui +++ b/src/frontend/utilities.ui @@ -6,8 +6,8 @@ 0 0 - 800 - 480 + 640 + 384