80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2072 from Cacodemon345/newqt

Browse Source 
qt: Scale statusbar icons based on DPI
This commit is contained in:
Miran Grča
2022-02-08 20:49:32 +01:00
committed by GitHub
parent 3c7c208d0b 3f1d638a46
commit 633d3fd9f0
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/qt_machinestatus.cpp
View File

@@ -145,7 +145,7 @@ namespace {
} }
}; };
static const QSize pixmap_size(16, 16); static QSize pixmap_size(16, 16);
static const QString pixmap_empty = QStringLiteral("_empty"); static const QString pixmap_empty = QStringLiteral("_empty");
static const QString pixmap_active = QStringLiteral("_active"); static const QString pixmap_active = QStringLiteral("_active");
static const QString pixmap_empty_active = QStringLiteral("_empty_active"); static const QString pixmap_empty_active = QStringLiteral("_empty_active");
@@ -171,6 +171,7 @@ struct MachineStatus::States {
Pixmaps pixmaps; Pixmaps pixmaps;
States(QObject* parent) { States(QObject* parent) {
pixmap_size = QSize(16, 16) * qobject_cast<MainWindow*>(parent->parent())->screen()->devicePixelRatio();
pixmaps.cartridge.load("/cartridge%1.ico"); pixmaps.cartridge.load("/cartridge%1.ico");
pixmaps.cassette.load("/cassette%1.ico"); pixmaps.cassette.load("/cassette%1.ico");
pixmaps.floppy_disabled.normal = ProgSettings::loadIcon(QStringLiteral("/floppy_disabled.ico")).pixmap(pixmap_size); pixmaps.floppy_disabled.normal = ProgSettings::loadIcon(QStringLiteral("/floppy_disabled.ico")).pixmap(pixmap_size);

3
src/qt/qt_mainwindow.cpp
View File

@@ -416,7 +416,10 @@ MainWindow::MainWindow(QWidget *parent) :
} }
#endif #endif
#ifdef _WIN32
ui->toolBar->setIconSize(QSize(16 * screen()->devicePixelRatio(), 16 * screen()->devicePixelRatio())); ui->toolBar->setIconSize(QSize(16 * screen()->devicePixelRatio(), 16 * screen()->devicePixelRatio()));
ui->statusbar->resize(ui->statusbar->width(), ui->statusbar->sizeHint().height() * screen()->devicePixelRatio());
#endif
} }
void MainWindow::closeEvent(QCloseEvent *event) { void MainWindow::closeEvent(QCloseEvent *event) {