Skip to content

Commit

Permalink
Merge PR #7464 to avoid merge conflicts when merging master.
Browse files Browse the repository at this point in the history
  • Loading branch information
jcsteh committed Aug 2, 2017
2 parents b5386fd + 99ef8a8 commit e3e2d9e
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 6 deletions.
13 changes: 7 additions & 6 deletions source/browseMode.py
Expand Up @@ -1565,13 +1565,14 @@ def _getTableCellCoords(self, info):
info = info.copy()
info.expand(textInfos.UNIT_CHARACTER)
fields=list(info.getTextWithFields())
# First record the ID of all layout tables so that we can skip them when searching for the deepest table
# If layout tables should not be reported, we should First record the ID of all layout tables so that we can skip them when searching for the deepest table
layoutIDs=set()
for field in fields:
if isinstance(field, textInfos.FieldCommand) and field.command == "controlStart" and field.field.get('table-layout'):
tableID=field.field.get('table-id')
if tableID is not None:
layoutIDs.add(tableID)
if not config.conf["documentFormatting"]["includeLayoutTables"]:
for field in fields:
if isinstance(field, textInfos.FieldCommand) and field.command == "controlStart" and field.field.get('table-layout'):
tableID=field.field.get('table-id')
if tableID is not None:
layoutIDs.add(tableID)
for field in reversed(fields):
if not (isinstance(field, textInfos.FieldCommand) and field.command == "controlStart"):
# Not a control field.
Expand Down
4 changes: 4 additions & 0 deletions user_docs/en/changes.t2t
Expand Up @@ -18,6 +18,7 @@
- The currently selected suggestion is now reported in Windows 10 Mail to/cc fields and the Windows 10 Settings search field. (#6241)
- A sound is now playd to indicate the appearance of suggestions in certain search fields in Windows 10 (E.g. start screen, settings search, Windows 10 mail to/cc fields). (#6241)
- Automatically report notifications in Skype for Business Desktop, such as when someone starts a conversation with you. (#7281)
- Automatically report incoming chat messages while in a Skype for Business conversation. (#7286)
- Automatically report notifications in Microsoft Edge, such as when a download starts. (#7281)
- You can now type in both contracted and uncontracted braille on a braille display with a braille keyboard. See the Braille Input section of the User Guide for details. (#2439)
- You can now enter Unicode braille characters from the braille keyboard on a braille display by selecting Unicode braille as the input table in Braille Settings. (#6449)
Expand All @@ -32,6 +33,7 @@
- For example, the "Fill display for context changes" and "Only when scrolling back" options can make working with lists and menus more efficient, since the items won't continually change their position on the display.
- See the section on the "Focus context presentation" setting in the User Guide for further details and examples.
- Many more control types and states have been abbreviated for braille. Please see "Control Type, State and Landmark Abbreviations" under Braille in the User Guide for a complete list. (#7188)
- In Firefox and Chrome, NVDA now supports complex dynamic grids such as spreadsheets where only some of the content might be loaded or displayed (specifically, the aria-rowcount, aria-colcount, aria-rowindex and aria-colindex attributes introduced in ARIA 1.1). (#7410)


== Changes ==
Expand Down Expand Up @@ -79,6 +81,8 @@
- In Microsoft Edge, landmarks are correctly localized in languages other than English. (#7328)
- Braille now correctly follows the selection when selecting text beyond the width of the display. For example, if you select multiple lines with shift+downArrow, braille now shows the last line you selected. (#5770)
- In Firefox, NVDA no longer spuriously reports "section" several times when opening details for a tweet on twitter.com. (#5741)
- Table navigation commands are no longer available for layout tables in Browse Mode unless reporting of layout tables is enabled. (#7382)
- In Firefox and Chrome, Browse Mode table navigation commands now skip over hidden table cells. (#6652, #5655)


== Changes for Developers ==
Expand Down

0 comments on commit e3e2d9e

Please sign in to comment.