Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Report unavailable (disabled) objects during object navigation #15785

Merged
merged 1 commit into from
Nov 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions source/NVDAObjects/IAccessible/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# A part of NonVisual Desktop Access (NVDA)
# Copyright (C) 2006-2023 NV Access Limited, Babbage B.V.
# Copyright (C) 2006-2023 NV Access Limited, Babbage B.V., Cyrille Bougot
# This file is covered by the GNU General Public License.
# See the file COPYING for more details.

Expand Down Expand Up @@ -1961,7 +1961,7 @@ def windowHasExtraIAccessibles(cls,windowHandle):

def _get_presentationType(self):
states=self.states
if controlTypes.State.INVISIBLE in states or controlTypes.State.UNAVAILABLE in states:
if controlTypes.State.INVISIBLE in states:
return self.presType_unavailable
if not self.windowHasExtraIAccessibles(self.windowHandle):
return self.presType_layout
Expand Down
4 changes: 2 additions & 2 deletions source/NVDAObjects/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# -*- coding: UTF-8 -*-
# A part of NonVisual Desktop Access (NVDA)
# Copyright (C) 2006-2023 NV Access Limited, Peter Vágner, Aleksey Sadovoy, Patrick Zajda, Babbage B.V.,
# Davy Kager, Leonard de Ruijter
# Davy Kager, Leonard de Ruijter, Cyrille Bougot
# This file is covered by the GNU General Public License.
# See the file COPYING for more details.

Expand Down Expand Up @@ -876,7 +876,7 @@ def _get_recursiveDescendants(self):

def _get_presentationType(self):
states=self.states
if controlTypes.State.INVISIBLE in states or controlTypes.State.UNAVAILABLE in states:
if controlTypes.State.INVISIBLE in states:
return self.presType_unavailable
role = self.role
landmark = self.landmark
Expand Down
11 changes: 4 additions & 7 deletions source/NVDAObjects/window/__init__.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#NVDAObjects/window.py
#A part of NonVisual Desktop Access (NVDA)
#Copyright (C) 2006-2019 NV Access Limited, Babbage B.V., Bill Dengler
#This file is covered by the GNU General Public License.
#See the file COPYING for more details.
# A part of NonVisual Desktop Access (NVDA)
# Copyright (C) 2006-2023 NV Access Limited, Babbage B.V., Bill Dengler, Cyrille Bougot
# This file is covered by the GNU General Public License.
# See the file COPYING for more details.

import re
import ctypes
Expand Down Expand Up @@ -30,8 +29,6 @@
GhostWindowFromHungWindow=None

def isUsableWindow(windowHandle):
if not ctypes.windll.user32.IsWindowEnabled(windowHandle):
return False
if not ctypes.windll.user32.IsWindowVisible(windowHandle):
return False
if GhostWindowFromHungWindow and ctypes.windll.user32.GhostWindowFromHungWindow(windowHandle):
Expand Down
1 change: 1 addition & 0 deletions user_docs/en/changes.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ New items have beeen added to "Help" for the NV Access "Get Help" page and Shop.
- NVDA's support for [Poedit https://poedit.net] is overhauled for Poedit version 3 and above.
Users of Poedit 1 are encouraged to update to Poedit 3 if they want to rely on enhanced accessibility in Poedit, such as shortcuts to read translator notes and comments. (#15313, #7303, @LeonarddeR)
- Braille viewer and speech viewer are now disabled in secure mode. (#15680)
- During object navigation, disabled (unavailable) objects will not be ignored anymore. (#15477, @CyrilleB79)
-

== Bug Fixes ==
Expand Down