From 2d865027ef3938d4601bf036743d3e0c8fb54b16 Mon Sep 17 00:00:00 2001 From: burmancomp <93915659+burmancomp@users.noreply.github.com> Date: Fri, 10 May 2024 09:02:42 +0300 Subject: [PATCH] revert 16463 and 16501 (#16519) Reverts #16463 and #16501 Issues fixed Issues reopened Reopens #16456 Reason for revert complexity Can this PR be reimplemented? If so, what is required for the next attempt at least execution of scrollToCursorOrSelection in _doNewObject --- source/braille.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/source/braille.py b/source/braille.py index b129182453a..450594c8b98 100644 --- a/source/braille.py +++ b/source/braille.py @@ -2560,9 +2560,8 @@ def _doNewObject(self, regions): self.mainBuffer.update() # Last region should receive focus. self.mainBuffer.focus(region) - if isinstance(region, TextInfoRegion): - self.scrollToCursorOrSelection(region) - elif self.buffer is self.mainBuffer: + self.scrollToCursorOrSelection(region) + if self.buffer is self.mainBuffer: self.update() elif self.buffer is self.messageBuffer and keyboardHandler.keyCounter>self._keyCountForLastMessage: self._dismissMessage() @@ -2616,10 +2615,8 @@ def _handlePendingUpdate(self): self.mainBuffer.update() self.mainBuffer.restoreWindow() if scrollTo is not None: - if self.buffer is self.messageBuffer: - self._dismissMessage(shouldUpdate=False) self.scrollToCursorOrSelection(scrollTo) - elif self.buffer is self.mainBuffer: + if self.buffer is self.mainBuffer: self.update() elif ( self.buffer is self.messageBuffer