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

Try to reduce hacks (#6313)

Browse Source
This commit is contained in:
Cacodemon345
2025-10-10 15:32:32 +06:00
committed by GitHub
parent 5bd7198f63
commit f97dea2be6
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/qt_openglrenderer.cpp
View File

@@ -822,7 +822,7 @@ OpenGLRenderer::read_shader_config()
}
OpenGLRenderer::OpenGLRenderer(QWidget *parent)
: QWindow(parent->windowHandle())
: QWindow((QWindow*)nullptr)
, renderTimer(new QTimer(this))
{
connect(renderTimer, &QTimer::timeout, this, [this]() { this->render(); } );

8
src/qt/qt_rendererstack.cpp
View File

@@ -377,7 +377,7 @@ RendererStack::createRenderer(Renderer renderer)
#ifdef __HAIKU__
current.reset(sw);
#else
current.reset(this->createWindowContainer(sw, this));
current.reset(this->createWindowContainer(sw));
#endif
}
break;
@@ -399,7 +399,7 @@ RendererStack::createRenderer(Renderer renderer)
imagebufs = {};
QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); });
});
current.reset(this->createWindowContainer(hw, this));
current.reset(this->createWindowContainer(hw));
break;
}
#if QT_CONFIG(vulkan)
@@ -434,7 +434,7 @@ RendererStack::createRenderer(Renderer renderer)
imagebufs = {};
QTimer::singleShot(0, this, [this]() { switchRenderer(Renderer::Software); });
});
current.reset(this->createWindowContainer(hw, this));
current.reset(this->createWindowContainer(hw));
break;
}
#endif
@@ -446,7 +446,9 @@ RendererStack::createRenderer(Renderer renderer)
current->setFocusProxy(this);
current->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
current->setAttribute(Qt::WA_AlwaysStackOnTop);
current->setStyleSheet("background-color: black");
this->setStyleSheet("background-color: black");
boxLayout->addWidget(current.get());
rendererWindow->r_monitor_index = m_monitor_index;

2
src/qt/qt_vulkanwindowrenderer.cpp
View File

@@ -823,7 +823,7 @@ public:
# endif /* 0*/
VulkanWindowRenderer::VulkanWindowRenderer(QWidget *parent)
: QVulkanWindow(parent->windowHandle())
: QVulkanWindow(NULL)
{
parentWidget = parent;
instance.setApiVersion(QVersionNumber(1, 0));