Skip to content

Windows 10 Calculator (follow-up to PR #9429): results announcement in compact overlay and unit converter #11883

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.

Sign up for GitHub

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

Merged
feerrenrut merged 4 commits into from
Dec 1, 2020
Merged

Windows 10 Calculator (follow-up to PR #9429): results announcement in compact overlay and unit converter #11883

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fc1f994
Windows 10 Calculator: avoid unit conversion result repetition. Re #1…
josephsl Nov 30, 2020
9c4c1e2
Windows 10 Calculator: remove unit conversion Automation Id's from na…
josephsl Nov 30, 2020
f5b5315
Windows 10 Calculator: announce calculation results in compact overla…
josephsl Nov 30, 2020
cb9af7d
Windows 10 Calculator/name change event handler: update unit converte…
josephsl Dec 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions source/appModules/calculator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@
"ContentPresenter",
# Briefly shown when closing date calculation calendar.
"Light Dismiss",
# Unit conversion/convert from.
"Value1",
# Unit conversion/converts into.
"Value2",
]


Expand All @@ -49,9 +53,10 @@ def event_nameChange(self, obj, nextHandler):
obj.UIAAutomationId not in noCalculatorEntryAnnouncements
and obj.name != self._resultsCache
):
# For unit conversion, UIA notification event presents much better messages.
# For unit conversion, both name change and notification events are fired,
# although UIA notification event presents much better messages.
# For date calculation, live region change event is also fired for difference between dates.
if obj.UIAAutomationId not in ("Value1", "Value2", "DateDiffAllUnitsResultLabel"):
if obj.UIAAutomationId != "DateDiffAllUnitsResultLabel":
ui.message(obj.name)
self._resultsCache = obj.name
if not self._shouldAnnounceResult:
Expand Down Expand Up @@ -94,7 +99,7 @@ def script_calculatorResult(self, gesture):
# Hack: only announce display text when an actual calculator button (usually equals button) is pressed.
# In redstone, pressing enter does not move focus to equals button.
if isinstance(focus, UIA):
if focus.UIAAutomationId == "CalculatorResults":
if focus.UIAAutomationId in ("CalculatorResults", "CalculatorAlwaysOnTopResults"):
queueHandler.queueFunction(queueHandler.eventQueue, focus.reportFocus)
else:
resultsScreen = api.getForegroundObject().children[1].lastChild
Expand Down