claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed all the vid_api checks in the QT code.

Browse Source
This commit is contained in:
OBattler
2025-06-29 00:35:38 +02:00
parent dcfd1026c2
commit c15f6d757c
3 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/qt_main.cpp
View File

@@ -835,7 +835,7 @@ main(int argc, char *argv[])
/* Set the PAUSE mode depending on the renderer. */ /* Set the PAUSE mode depending on the renderer. */
#ifdef USE_VNC #ifdef USE_VNC
if (vid_api == 5) if (vid_api == 3)
plat_pause(1); plat_pause(1);
else else
#endif #endif

6
src/qt/qt_mainwindow.cpp
View File

@@ -429,7 +429,7 @@ MainWindow::MainWindow(QWidget *parent)
} }
#ifndef USE_VNC #ifndef USE_VNC
if (vid_api == 5) if (vid_api == 3)
vid_api = 0; vid_api = 0;
ui->actionVNC->setVisible(false); ui->actionVNC->setVisible(false);
#endif #endif
@@ -450,7 +450,7 @@ MainWindow::MainWindow(QWidget *parent)
if (!vulkanAvailable) if (!vulkanAvailable)
#endif #endif
{ {
if (vid_api == 4) if (vid_api == 2)
vid_api = 0; vid_api = 0;
ui->actionVulkan->setVisible(false); ui->actionVulkan->setVisible(false);
} }
@@ -465,7 +465,7 @@ MainWindow::MainWindow(QWidget *parent)
connect(actGroup, &QActionGroup::triggered, [this](QAction *action) { connect(actGroup, &QActionGroup::triggered, [this](QAction *action) {
vid_api = action->property("vid_api").toInt(); vid_api = action->property("vid_api").toInt();
#ifdef USE_VNC #ifdef USE_VNC
if (vnc_enabled && vid_api != 5) { if (vnc_enabled && vid_api != 3) {
startblit(); startblit();
vnc_enabled = 0; vnc_enabled = 0;
vnc_close(); vnc_close();

28
src/qt/qt_mainwindow.ui
View File

@@ -397,28 +397,6 @@
<number>0</number> <number>0</number>
</property> </property>
</action> </action>
<action name="actionHardware_Renderer_OpenGL">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Qt (&amp;OpenGL)</string>
</property>
<property name="vid_api" stdset="0">
<number>1</number>
</property>
</action>
<action name="actionHardware_Renderer_OpenGL_ES">
<property name="checkable">
<bool>true</bool>
</property>
<property name="text">
<string>Qt (OpenGL &amp;ES)</string>
</property>
<property name="vid_api" stdset="0">
<number>2</number>
</property>
</action>
<action name="actionHide_status_bar"> <action name="actionHide_status_bar">
<property name="checkable"> <property name="checkable">
<bool>true</bool> <bool>true</bool>
@@ -749,7 +727,7 @@
<string>Open&amp;GL (3.0 Core)</string> <string>Open&amp;GL (3.0 Core)</string>
</property> </property>
<property name="vid_api" stdset="0"> <property name="vid_api" stdset="0">
<number>3</number> <number>1</number>
</property> </property>
</action> </action>
<action name="actionPreferences"> <action name="actionPreferences">
@@ -841,7 +819,7 @@
<string>&amp;Vulkan</string> <string>&amp;Vulkan</string>
</property> </property>
<property name="vid_api" stdset="0"> <property name="vid_api" stdset="0">
<number>4</number> <number>2</number>
</property> </property>
</action> </action>
<action name="actionMCA_devices"> <action name="actionMCA_devices">
@@ -865,7 +843,7 @@
<string>VNC</string> <string>VNC</string>
</property> </property>
<property name="vid_api" stdset="0"> <property name="vid_api" stdset="0">
<number>5</number> <number>3</number>
</property> </property>
</action> </action>
<action name="actionOpen_screenshots_folder"> <action name="actionOpen_screenshots_folder">