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

qt: Status bar fixes

Browse Source 
* Fix inverted logic for network icon
* Scale the status bar pixmaps only on Windows
This commit is contained in:
Cacodemon345
2022-02-09 15:58:59 +06:00
committed by GitHub
parent 3f829e64f5
commit 3bcc3f6989
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/qt/qt_machinestatus.cpp
View File

@@ -172,7 +172,9 @@ struct MachineStatus::States {
Pixmaps pixmaps; Pixmaps pixmaps;
States(QObject* parent) { States(QObject* parent) {
#ifdef _WIN32
pixmap_size = QSize(16, 16) * qobject_cast<MainWindow*>(parent->parent())->screen()->devicePixelRatio(); pixmap_size = QSize(16, 16) * qobject_cast<MainWindow*>(parent->parent())->screen()->devicePixelRatio();
#endif
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);
@@ -332,7 +334,7 @@ void MachineStatus::refresh(QStatusBar* sbar) {
int c_xta = hdd_count(HDD_BUS_XTA); int c_xta = hdd_count(HDD_BUS_XTA);
int c_ide = hdd_count(HDD_BUS_IDE); int c_ide = hdd_count(HDD_BUS_IDE);
int c_scsi = hdd_count(HDD_BUS_SCSI); int c_scsi = hdd_count(HDD_BUS_SCSI);
int do_net = (network_type == NET_TYPE_NONE) || (network_card == 0); int do_net = network_available();
sbar->removeWidget(d->cassette.label.get()); sbar->removeWidget(d->cassette.label.get());
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {