From df16ed641f5c1f06946832c549e402822227cb0c Mon Sep 17 00:00:00 2001 From: fwcd Date: Sun, 10 Mar 2024 02:17:33 +0100 Subject: [PATCH 1/2] OpenGLWindow: Fix sizing on WASM by setting `Qt::FramelessWindowHint` --- src/widget/openglwindow.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/widget/openglwindow.cpp b/src/widget/openglwindow.cpp index 84b7cb9b3aa..11390e47aa4 100644 --- a/src/widget/openglwindow.cpp +++ b/src/widget/openglwindow.cpp @@ -12,6 +12,10 @@ OpenGLWindow::OpenGLWindow(WGLWidget* pWidget) : m_pWidget(pWidget) { setFormat(WaveformWidgetFactory::getSurfaceFormat()); + // This is required to ensure that QOpenGLWindows have no minimum size (When + // targeting WebAssembly, the widgets will otherwise always have a minimum + // width and minimum height of 100 pixels). + setFlag(Qt::FramelessWindowHint); } OpenGLWindow::~OpenGLWindow() { From d457c04096b987b2c9a86026555e3d890c3a7ec6 Mon Sep 17 00:00:00 2001 From: fwcd Date: Sun, 10 Mar 2024 02:29:48 +0100 Subject: [PATCH 2/2] OpenGLWindow: Limit FramelessWindowHint to Emscripten --- src/widget/openglwindow.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/widget/openglwindow.cpp b/src/widget/openglwindow.cpp index 11390e47aa4..ae2f6593865 100644 --- a/src/widget/openglwindow.cpp +++ b/src/widget/openglwindow.cpp @@ -12,10 +12,12 @@ OpenGLWindow::OpenGLWindow(WGLWidget* pWidget) : m_pWidget(pWidget) { setFormat(WaveformWidgetFactory::getSurfaceFormat()); +#ifdef __EMSCRIPTEN__ // This is required to ensure that QOpenGLWindows have no minimum size (When // targeting WebAssembly, the widgets will otherwise always have a minimum // width and minimum height of 100 pixels). setFlag(Qt::FramelessWindowHint); +#endif } OpenGLWindow::~OpenGLWindow() {