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

Delegate input events of HardwareRenderer to RendererStack

Browse Source
This commit is contained in:
Cacodemon345
2021-12-18 00:37:30 +06:00
parent cfbc9c22dc
commit 0313d02073
3 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/qt/qt_hardwarerenderer.cpp
View File

@@ -47,18 +47,21 @@ void HardwareRenderer::resizeEvent(QResizeEvent *event) {
QOpenGLWindow::resizeEvent(event); QOpenGLWindow::resizeEvent(event);
} }
void HardwareRenderer::mouseReleaseEvent(QMouseEvent *event) bool HardwareRenderer::event(QEvent *event)
{ {
if (this->geometry().contains(event->pos()) && event->button() == Qt::LeftButton && !mouse_capture) switch (event->type())
{ {
plat_mouse_capture(1); default:
this->setCursor(Qt::BlankCursor); return QOpenGLWindow::event(event);
return; case QEvent::MouseButtonPress:
} case QEvent::MouseMove:
if (mouse_capture && event->button() == Qt::MiddleButton) case QEvent::MouseButtonRelease:
{ case QEvent::KeyPress:
plat_mouse_capture(0); case QEvent::KeyRelease:
this->setCursor(Qt::ArrowCursor); case QEvent::Wheel:
return; case QEvent::Enter:
case QEvent::Leave:
return QApplication::sendEvent(parentWidget, event);
} }
return false;
} }

8
src/qt/qt_hardwarerenderer.hpp
View File

@@ -23,15 +23,17 @@ class HardwareRenderer : public QOpenGLWindow, protected QOpenGLFunctions, publi
private: private:
bool wayland = false; bool wayland = false;
QWidget* parentWidget{nullptr};
public: public:
void resizeGL(int w, int h) override; void resizeGL(int w, int h) override;
void initializeGL() override; void initializeGL() override;
void paintGL() override; void paintGL() override;
HardwareRenderer(QWindow* parent = nullptr) HardwareRenderer(QWidget* parent = nullptr)
: QOpenGLWindow(QOpenGLWindow::NoPartialUpdate, parent), QOpenGLFunctions() : QOpenGLWindow(QOpenGLWindow::NoPartialUpdate, parent->windowHandle()), QOpenGLFunctions()
{ {
setMinimumSize(QSize(16, 16)); setMinimumSize(QSize(16, 16));
setFlags(Qt::FramelessWindowHint); setFlags(Qt::FramelessWindowHint);
parentWidget = parent;
} }
~HardwareRenderer() ~HardwareRenderer()
{ {
@@ -49,5 +51,5 @@ public slots:
protected: protected:
void resizeEvent(QResizeEvent *event) override; void resizeEvent(QResizeEvent *event) override;
void mouseReleaseEvent(QMouseEvent* event) override; bool event(QEvent* event) override;
}; };

5
src/qt/qt_rendererstack.cpp
View File

@@ -184,7 +184,7 @@ void RendererStack::switchRenderer(Renderer renderer) {
case Renderer::OpenGL: case Renderer::OpenGL:
{ {
this->createWinId(); this->createWinId();
auto hw = new HardwareRenderer(this->windowHandle()); auto hw = new HardwareRenderer(this);
connect(this, &RendererStack::blitToRenderer, hw, &HardwareRenderer::onBlit, Qt::QueuedConnection); connect(this, &RendererStack::blitToRenderer, hw, &HardwareRenderer::onBlit, Qt::QueuedConnection);
hw->setRenderType(HardwareRenderer::RenderType::OpenGL); hw->setRenderType(HardwareRenderer::RenderType::OpenGL);
current.reset(this->createWindowContainer(hw, this)); current.reset(this->createWindowContainer(hw, this));
@@ -193,7 +193,7 @@ void RendererStack::switchRenderer(Renderer renderer) {
case Renderer::OpenGLES: case Renderer::OpenGLES:
{ {
this->createWinId(); this->createWinId();
auto hw = new HardwareRenderer(this->windowHandle()); auto hw = new HardwareRenderer(this);
connect(this, &RendererStack::blitToRenderer, hw, &HardwareRenderer::onBlit, Qt::QueuedConnection); connect(this, &RendererStack::blitToRenderer, hw, &HardwareRenderer::onBlit, Qt::QueuedConnection);
hw->setRenderType(HardwareRenderer::RenderType::OpenGLES); hw->setRenderType(HardwareRenderer::RenderType::OpenGLES);
current.reset(this->createWindowContainer(hw, this)); current.reset(this->createWindowContainer(hw, this));
@@ -201,6 +201,7 @@ void RendererStack::switchRenderer(Renderer renderer) {
} }
} }
current->setFocusPolicy(Qt::NoFocus); current->setFocusPolicy(Qt::NoFocus);
current->setFocusProxy(this);
addWidget(current.get()); addWidget(current.get());
for (auto& in_use : buffers_in_use) for (auto& in_use : buffers_in_use)