Merge pull request #2079 from Cacodemon345/patch-48

qt: Status bar fixes
This commit is contained in:
Miran Grča
2022-02-09 11:07:30 +01:00
committed by GitHub

View File

@@ -172,7 +172,9 @@ struct MachineStatus::States {
Pixmaps pixmaps;
States(QObject* parent) {
#ifdef _WIN32
pixmap_size = QSize(16, 16) * qobject_cast<MainWindow*>(parent->parent())->screen()->devicePixelRatio();
#endif
pixmaps.cartridge.load("/cartridge%1.ico");
pixmaps.cassette.load("/cassette%1.ico");
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_ide = hdd_count(HDD_BUS_IDE);
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());
for (int i = 0; i < 2; ++i) {