From bda945218db378210d35bc85fbac6c0dbd818c78 Mon Sep 17 00:00:00 2001 From: Megamouse Date: Mon, 5 Jun 2017 20:50:56 +0200 Subject: [PATCH] add dpi scaling for windows fix welcome screen for all platforms (looks slightly different) --- rpcs3/main.cpp | 4 ++++ rpcs3/rpcs3qt/welcome_dialog.cpp | 16 ++++++++-------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/rpcs3/main.cpp b/rpcs3/main.cpp index f4aef1d6c1..65f31f329e 100644 --- a/rpcs3/main.cpp +++ b/rpcs3/main.cpp @@ -8,6 +8,10 @@ int main(int argc, char** argv) { +#ifdef Q_OS_WIN + SetProcessDPIAware(); +#endif + rpcs3_app app(argc, argv); app.Init(); return app.exec(); diff --git a/rpcs3/rpcs3qt/welcome_dialog.cpp b/rpcs3/rpcs3qt/welcome_dialog.cpp index 68ff83b7ea..d1577d9e3e 100644 --- a/rpcs3/rpcs3qt/welcome_dialog.cpp +++ b/rpcs3/rpcs3qt/welcome_dialog.cpp @@ -35,7 +35,7 @@ welcome_dialog::welcome_dialog(QWidget* parent) : QDialog(parent) QIcon rpcs3_icon = QIcon(":/rpcs3.ico"); QLabel* icon = new QLabel(this); icon->setPixmap(rpcs3_icon.pixmap(120, 120)); - icon->setAlignment(Qt::AlignLeft); + icon->setAlignment(Qt::AlignRight); QLabel* header_1 = new QLabel(tr( "

Welcome to RPCS3

" @@ -45,14 +45,14 @@ welcome_dialog::welcome_dialog(QWidget* parent) : QDialog(parent) header_font.setPointSize(12); header_1->setFont(header_font); - header_1->setFixedWidth(400); + header_1->setFixedWidth(header_1->sizeHint().width()); header_1->setWordWrap(true); QLabel* header_2 = new QLabel(tr( "

An open-source PlayStation 3 emulator for Windows and Linux funded with Patreon!

" )); - header_2->setFixedWidth(400); + header_2->setFixedWidth(header_1->sizeHint().width() * 1.2); header_2->setWordWrap(true); QLabel* caption = new QLabel(tr( @@ -68,7 +68,7 @@ welcome_dialog::welcome_dialog(QWidget* parent) : QDialog(parent) caption_font.setWeight(QFont::Medium); caption->setFont(caption_font); - caption->setFixedWidth(550); + caption->setFixedWidth(caption->sizeHint().width()); caption->setWordWrap(true); caption->setOpenExternalLinks(true); caption->setAlignment(Qt::AlignLeft); @@ -95,7 +95,7 @@ welcome_dialog::welcome_dialog(QWidget* parent) : QDialog(parent) top_layout->setAlignment(Qt::AlignCenter); top_layout->addStretch(); top_layout->addWidget(icon); - top_layout->addStretch(); + top_layout->addSpacing(icon->sizeHint().width() / 10); top_layout->addLayout(header_layout); top_layout->addStretch(); @@ -114,16 +114,16 @@ welcome_dialog::welcome_dialog(QWidget* parent) : QDialog(parent) // Main Layout QVBoxLayout* layout = new QVBoxLayout(); - top_layout->addStretch(); layout->addLayout(top_layout); + layout->addSpacing(25); layout->addLayout(bottom_layout); layout->addSpacing(25); layout->addLayout(button_layout); - setFixedSize(600, 350); - setWindowIcon(rpcs3_icon); setWindowTitle(tr("Welcome to RPCS3")); setWindowFlags(Qt::WindowTitleHint); setLayout(layout); + + setFixedSize(sizeHint()); }