Skip to content

Commit 281e69e

Browse files
committed
Improved HiDPI support and added Stable Tooltip
1 parent c4c697f commit 281e69e

File tree

3 files changed

+48
-3
lines changed

3 files changed

+48
-3
lines changed

OpenRCT2Launcher/configuration.ui

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,27 @@
77
<x>0</x>
88
<y>0</y>
99
<width>720</width>
10-
<height>471</height>
10+
<height>480</height>
1111
</rect>
1212
</property>
13+
<property name="sizePolicy">
14+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
15+
<horstretch>0</horstretch>
16+
<verstretch>0</verstretch>
17+
</sizepolicy>
18+
</property>
19+
<property name="minimumSize">
20+
<size>
21+
<width>720</width>
22+
<height>480</height>
23+
</size>
24+
</property>
25+
<property name="maximumSize">
26+
<size>
27+
<width>720</width>
28+
<height>480</height>
29+
</size>
30+
</property>
1331
<property name="windowTitle">
1432
<string>Options</string>
1533
</property>
@@ -88,6 +106,9 @@
88106
<property name="enabled">
89107
<bool>false</bool>
90108
</property>
109+
<property name="toolTip">
110+
<string>Stable is not currently avaiable through the launcher</string>
111+
</property>
91112
<property name="text">
92113
<string>Stable</string>
93114
</property>

OpenRCT2Launcher/mainwindow.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ MainWindow::MainWindow(QWidget *parent) :
1515
ui->progressBar->setHidden(true);
1616
connect(ui->launchButton, &QPushButton::clicked, this, &MainWindow::launch);
1717

18+
#ifndef Q_OS_OSX
19+
ui->splash->setScaledContents(true);
20+
#endif
21+
1822
connect(&updater, &Updater::installed, [this]{ ui->progressBar->setHidden(true); ui->launchButton->setEnabled(true); });
1923
connect(&updater, &Updater::error, [this](QString error){ ui->errorLabel->setText(error); ui->launchButton->setEnabled(true); });
2024
connect(&updater, &Updater::downloadProgress, [this](qint64 bytesReceived, qint64 bytesTotal){
@@ -28,7 +32,6 @@ MainWindow::~MainWindow()
2832
delete ui;
2933
}
3034

31-
#include <QFileDialog>
3235
void MainWindow::on_optionsButton_clicked() {
3336
QDir dir = QDir::home();
3437
if (dir.cd(OPENRCT2_BASE)) {

OpenRCT2Launcher/mainwindow.ui

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,24 @@
1010
<height>280</height>
1111
</rect>
1212
</property>
13+
<property name="sizePolicy">
14+
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
15+
<horstretch>0</horstretch>
16+
<verstretch>0</verstretch>
17+
</sizepolicy>
18+
</property>
19+
<property name="minimumSize">
20+
<size>
21+
<width>420</width>
22+
<height>280</height>
23+
</size>
24+
</property>
25+
<property name="maximumSize">
26+
<size>
27+
<width>420</width>
28+
<height>280</height>
29+
</size>
30+
</property>
1331
<property name="windowTitle">
1432
<string>OpenRCT2 Launcher</string>
1533
</property>
@@ -31,10 +49,13 @@
3149
<number>0</number>
3250
</property>
3351
<item>
34-
<widget class="QLabel" name="label">
52+
<widget class="QLabel" name="splash">
3553
<property name="pixmap">
3654
<pixmap resource="resources.qrc">:/splash.png</pixmap>
3755
</property>
56+
<property name="alignment">
57+
<set>Qt::AlignBottom|Qt::AlignHCenter</set>
58+
</property>
3859
</widget>
3960
</item>
4061
<item>

0 commit comments

Comments
 (0)