From 53bfe72967270bc7c448bd892f4a406a389b779b Mon Sep 17 00:00:00 2001 From: Even Oscar Andersen Date: Fri, 7 Mar 2025 07:38:47 +0100 Subject: [PATCH] wasm: Honor invisible and disabled when setting visibility for a11y MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-115926 Change-Id: I04ccf9371af4eb4890a9cfe21cc6d8f005a3cc44 Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/wasm/qwasmaccessibility.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/platforms/wasm/qwasmaccessibility.cpp b/src/plugins/platforms/wasm/qwasmaccessibility.cpp index 2e430176bec..6985874b581 100644 --- a/src/plugins/platforms/wasm/qwasmaccessibility.cpp +++ b/src/plugins/platforms/wasm/qwasmaccessibility.cpp @@ -330,6 +330,7 @@ void QWasmAccessibility::setHtmlElementVisibility(QAccessibleInterface *iface, b container.call("appendChild", element); + visible = visible && !iface->state().invisible && !iface->state().disabled; element.set("ariaHidden", !visible); // ariaHidden mean completely hidden; maybe some sort of soft-hidden should be used. } @@ -549,8 +550,7 @@ void QWasmAccessibility::populateAccessibilityTree(QAccessibleInterface *iface) // Create html element for the interface, sync up properties. ensureHtmlElement(iface); - const bool visible = !iface->state().invisible; - setHtmlElementVisibility(iface, visible); + setHtmlElementVisibility(iface, true); setHtmlElementGeometry(iface); setHtmlElementTextName(iface); setHtmlElementDescription(iface);