From e290ebae9ff2fe6064fdf2f5107221faff04f28b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Arve=20S=C3=A6ther?= Date: Tue, 11 Feb 2020 09:32:01 +0100 Subject: a11y: Remove a ### Qt6 that doesn't make much sense MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the enum names are "the same", the comment seems to suggest to change the enum value of Canvas to 0x401. I don't see any benefit to that really. In addition, we are today using UIA in favor of MSAA, and the closest matching role (controlTypeId) seems to be for a static image (UIA_ImageControlTypeId), which is quite different from the semantic of IA2_ROLE_CANVAS. For the record, here's a list of similar roles for different a11y APIs: IA2: IA2_ROLE_CANVAS An object that can be drawn into and to manage events from the objects drawn into it. Also refer to IA2_ROLE_FRAME, IA2_ROLE_GLASS_PANE, and IA2_ROLE_LAYERED_PANE. MSAA: ROLE_SYSTEM_DIAGRAM The object represents a graphical image that is used to diagram data. UIA: UIA_ImageControlTypeId Identifies the _Image_ control type. atspi: ATSPI_ROLE_CANVAS Object that can be drawn into and is used to trap events. Change-Id: Ic2ead0dc40be0ae2e798f49285eb6a392cc29142 Reviewed-by: André de la Rocha --- src/gui/accessible/qaccessible.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/accessible') diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 2220efd5cb..f7564a3076 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -280,7 +280,7 @@ public: HotkeyField = 0x00000032, Slider = 0x00000033, SpinBox = 0x00000034, - Canvas = 0x00000035, // Diagram for MSAA + Canvas = 0x00000035, // MSAA: ROLE_SYSTEM_DIAGRAM - The object represents a graphical image that is used to diagram data. Animation = 0x00000036, Equation = 0x00000037, ButtonDropDown = 0x00000038, // The object represents a button that expands a grid. @@ -302,7 +302,7 @@ public: Notification = 0x00000086, // IAccessible2 roles - // IA2_ROLE_CANVAS = 0x401, ### Qt 6 use this one instead of Canvas above + // IA2_ROLE_CANVAS = 0x401, // An object that can be drawn into and to manage events from the objects drawn into it // IA2_ROLE_CAPTION = 0x402, // IA2_ROLE_CHECK_MENU_ITEM = 0x403, ColorChooser = 0x404, -- cgit v1.2.3