mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-22 17:45:31 -07:00
Code Issues Packages Projects Releases Activity

Merge pull request #6665 from Cacodemon345/qt-misc-fixes-2

Browse Source 
Qt misc. fixes.
This commit is contained in:
Miran Grča
2026-01-03 17:37:34 +01:00
committed by GitHub
parent da6e9080e2 24e164c862
commit 8f6517d9c6
2 changed files with 5 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/qt/qt_mediamenu.cpp
View File

@@ -292,7 +292,7 @@ MediaMenu::cassetteMount(const QString &filename, bool wp)
pc_cas_set_fname(cassette, cassette_fname);
}
ui_sb_update_icon_state(SB_CASSETTE, filename.isEmpty() ? 1 : 0);
ui_sb_update_icon_state(SB_CASSETTE, cassette->fname == nullptr);
ui_sb_update_icon_wp(SB_CASSETTE, cassette_ui_writeprot);
mhm.addImageToHistory(0, ui::MediaType::Cassette, previous_image.filePath(), filename);
cassetteUpdateMenu();
@@ -352,7 +352,7 @@ MediaMenu::cartridgeMount(int i, const QString &filename)
QByteArray filenameBytes = filename.toUtf8();
cart_load(i, filenameBytes.data());
ui_sb_update_icon_state(SB_CARTRIDGE | i, filename.isEmpty() ? 1 : 0);
ui_sb_update_icon_state(SB_CARTRIDGE | i, cart_fns[i][0] == 0);
mhm.addImageToHistory(i, ui::MediaType::Cartridge, previous_image.filePath(), filename);
cartridgeUpdateMenu(i);
ui_sb_update_tip(SB_CARTRIDGE | i);
@@ -468,7 +468,7 @@ MediaMenu::floppyMount(int i, const QString &filename, bool wp)
mhm.addImageToHistory(i, ui::MediaType::Floppy, previous_image.filePath(), QString(filenameBytes));
} else
mhm.addImageToHistory(i, ui::MediaType::Floppy, previous_image.filePath(), filename);
ui_sb_update_icon_state(SB_FLOPPY | i, filename.isEmpty() ? 1 : 0);
ui_sb_update_icon_state(SB_FLOPPY | i, drive_empty[i]);
ui_sb_update_icon_wp(SB_FLOPPY | i, ui_writeprot[i]);
floppyUpdateMenu(i);
ui_sb_update_tip(SB_FLOPPY | i);
@@ -902,7 +902,7 @@ MediaMenu::rdiskMount(int i, const QString &filename, bool wp)
}
mhm.addImageToHistory(i, ui::MediaType::RDisk, rdisk_drives[i].prev_image_path, rdisk_drives[i].image_path);
ui_sb_update_icon_state(SB_RDISK | i, filename.isEmpty() ? 1 : 0);
ui_sb_update_icon_state(SB_RDISK | i, dev->drv->fp == NULL);
ui_sb_update_icon_wp(SB_RDISK | i, wp);
rdiskUpdateMenu(i);
ui_sb_update_tip(SB_RDISK | i);
@@ -1082,7 +1082,7 @@ MediaMenu::moMount(int i, const QString &filename, bool wp)
}
mhm.addImageToHistory(i, ui::MediaType::Mo, mo_drives[i].prev_image_path, mo_drives[i].image_path);
ui_sb_update_icon_state(SB_MO | i, filename.isEmpty() ? 1 : 0);
ui_sb_update_icon_state(SB_MO | i, dev->drv->fp == nullptr);
moUpdateMenu(i);
ui_sb_update_tip(SB_MO | i);

7
src/qt/qt_vulkanrenderer.cpp
View File

@@ -428,8 +428,6 @@ VulkanRenderer2::updateSamplers()
void
VulkanRenderer2::initResources()
{
qDebug("initResources");
VkDevice dev = m_window->device();
m_devFuncs = m_window->vulkanInstance()->deviceFunctions(dev);
@@ -811,8 +809,6 @@ VulkanRenderer2::initResources()
void
VulkanRenderer2::initSwapChainResources()
{
qDebug("initSwapChainResources");
// Projection matrix
m_proj = m_window->clipCorrectionMatrix(); // adjust for Vulkan-OpenGL clip space differences
}
@@ -820,14 +816,11 @@ VulkanRenderer2::initSwapChainResources()
void
VulkanRenderer2::releaseSwapChainResources()
{
qDebug("releaseSwapChainResources");
}
void
VulkanRenderer2::releaseResources()
{
qDebug("releaseResources");
VkDevice dev = m_window->device();
if (m_sampler) {