Skip to content

Commit

Permalink
Avoid interfering with Braille output
Browse files Browse the repository at this point in the history
  • Loading branch information
cary-rowen committed Oct 4, 2024
1 parent 97df0a7 commit 61d2aaa
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
14 changes: 9 additions & 5 deletions addon/globalPlugins/ime_expressive.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@ def handleInputCompositionStart(self,compositionString,selectionStart,selectionE
self.ismsf=True
self.isms=True
self.handleInputCandidateListUpdate(obj.lastChild.name,0,'ms')
api.setNavigatorObject(obj)
self.setNavigatorObject(obj)
except AttributeError as ae:
log.warning(f"AttributeError in handleInputCompositionStart: {ae}")

Expand Down Expand Up @@ -292,7 +292,7 @@ def speakPunc(self,isl=False):

def clear_ime(self):
global lastCandidate
api.setNavigatorObject(api.getFocusObject())
self.setNavigatorObject(api.getFocusObject())
lastCandidate=''
self.selectedCandidate=''
self.selectedIndex=0
Expand Down Expand Up @@ -332,7 +332,7 @@ def event_UIA_window_windowOpen(self, obj, nextHandler):
self.ismsf=True
self.isms=True
self.handleInputCandidateListUpdate(obj.lastChild.name,0,'ms')
api.setNavigatorObject(obj)
self.setNavigatorObject(obj)
except AttributeError as ae:
log.warning(f"AttributeError in event_UIA_window_windowOpen: {ae}")
except Exception as e:
Expand All @@ -346,7 +346,7 @@ def event_UIA_elementSelected(self, obj, nextHandler):
self.ismsf=True
self.isms=True
self.handleInputCandidateListUpdate(obj.lastChild.name,int(obj.firstChild.name)-1,'ms')
api.setNavigatorObject(obj)
self.setNavigatorObject(obj)
except AttributeError as ae:
log.warning(f"AttributeError in event_UIA_elementSelected: {ae}")
except Exception as e:
Expand Down Expand Up @@ -425,4 +425,8 @@ def script_selectRight(self,gesture):
queueHandler.queueFunction(queueHandler.eventQueue,speech.cancelSpeech)
wx.CallAfter(brailleInput.BrailleInputHandler.sendChars,self,ch)
break
self.clearGestureBindings ()
self.clearGestureBindings ()

def setNavigatorObject(self, obj):
if config.conf["reviewCursor"]["followFocus"]:
api.setNavigatorObject(obj)
2 changes: 1 addition & 1 deletion buildVars.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def _(arg):
"addon_description": _("""This add-on provides Chinese input method support for the NVDA screen reader.
It enhances the Chinese input experience in terms of input habits and efficiency for NVDA users."""),
# version
"addon_version": "2024.9.28",
"addon_version": "2024.10.04",
# Author(s)
"addon_author": "Chenfu <[email protected]> Cary-rowen <[email protected]>",
# URL for the add-on documentation support
Expand Down

0 comments on commit 61d2aaa

Please sign in to comment.