Fixed status announcements interrupting page information for the web navigation.

src/cthulhu/scripts/web/script.py

@@ -1504,6 +1504,7 @@ class Script(default.Script):
 
     def togglePresentationMode(self, inputEvent, documentFrame=None):
         [obj, characterOffset] = self.utilities.getCaretContext(documentFrame)
+        interrupt = inputEvent is not None
         if self._inFocusMode:
             parent = AXObject.get_parent(obj)
             if AXUtilities.is_list_box(parent):
@@ -1511,7 +1512,7 @@ class Script(default.Script):
             elif AXUtilities.is_menu(parent):
                 self.utilities.setCaretContext(AXObject.get_parent(parent), -1)
             if not self._loadingDocumentContent:
-                self.presentMessage(messages.MODE_BROWSE)
+                self.presentMessage(messages.MODE_BROWSE, interrupt=interrupt)
                 if not self._shouldSuppressBrowseModeSound(obj, inputEvent):
                     sound_theme_manager.getManager().playBrowseModeSound()
         else:
@@ -1521,7 +1522,7 @@ class Script(default.Script):
                     or inputEvent):
                 self.utilities.grabFocus(obj)
 
-            self.presentMessage(messages.MODE_FOCUS)
+            self.presentMessage(messages.MODE_FOCUS, interrupt=interrupt)
             sound_theme_manager.getManager().playFocusModeSound()
         self._inFocusMode = not self._inFocusMode
         self._focusModeIsSticky = False

src/cthulhu/structural_navigation.py

@@ -935,9 +935,9 @@ class StructuralNavigation:
             return
 
         if not isNext:
-            self._script.presentMessage(messages.WRAPPING_TO_BOTTOM)
+            wrapMessage = messages.WRAPPING_TO_BOTTOM
         else:
-            self._script.presentMessage(messages.WRAPPING_TO_TOP)
+            wrapMessage = messages.WRAPPING_TO_TOP
 
         matches = self._getAll(structuralNavigationObject, arg)
         if not isNext:
@@ -946,6 +946,7 @@ class StructuralNavigation:
         for match in matches:
             if _isValidMatch(match):
                 structuralNavigationObject.present(match, arg)
+                self._script.presentMessage(wrapMessage, interrupt=False)
                 return
 
         structuralNavigationObject.present(None, arg)