1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wasm: use QWasmWindow::fromWindow()

Browse Source 
Make it test for null QWindow and handle(), use it
instead of C-style casting handle().

Change-Id: I7ffb1ef5d3d3c09c8ae44ec0141e93530a04abe6
Reviewed-by: Even Oscar Andersen <even.oscar.andersen@qt.io>
Reviewed-by: Piotr Wierciński <piotr.wiercinski@qt.io>
This commit is contained in:
Morten Sørvig 2025-02-25 16:03:13 +01:00
parent bdc9665494
commit 83b6139149
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/wasm/qwasminputcontext.cpp
View File

@ -327,8 +327,8 @@ void QWasmInputContext::updateInputElement()
m_inputElement.set("value", ""); m_inputElement.set("value", "");
m_inputElement.call<void>("blur"); m_inputElement.call<void>("blur");
if (focusWindow && focusWindow->handle()) if (QWasmWindow *wasmwindow = QWasmWindow::fromWindow(focusWindow))
((QWasmWindow *)(focusWindow->handle()))->focus(); wasmwindow->focus();
return; return;
} }

4
src/plugins/platforms/wasm/qwasmwindow.cpp
View File

@ -211,8 +211,10 @@ QSurfaceFormat QWasmWindow::format() const
return window()->requestedFormat(); return window()->requestedFormat();
} }
QWasmWindow *QWasmWindow::fromWindow(QWindow *window) QWasmWindow *QWasmWindow::fromWindow(const QWindow *window)
{ {
if (!window ||!window->handle())
return nullptr;
return static_cast<QWasmWindow *>(window->handle()); return static_cast<QWasmWindow *>(window->handle());
} }

2
src/plugins/platforms/wasm/qwasmwindow.h
View File

@ -45,7 +45,7 @@ public:
QWasmBackingStore *backingStore, WId nativeHandle); QWasmBackingStore *backingStore, WId nativeHandle);
~QWasmWindow() final; ~QWasmWindow() final;
static QWasmWindow *fromWindow(QWindow *window); static QWasmWindow *fromWindow(const QWindow *window);
QSurfaceFormat format() const override; QSurfaceFormat format() const override;
void registerEventHandlers(); void registerEventHandlers();