CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-17 11:22:28 +12:00
Code Issues Projects Releases Wiki Activity

Fixed cursor selection without suggestions

Browse source
This commit is contained in:
TheJackiMonster 2021-02-22 01:26:07 +01:00
parent ad21d5faa5
commit 0cb65c452e
No known key found for this signature in database
GPG key ID: D850A5F772E880F9
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
manuskript/ui/views/textEditView.py
View file

@ -482,12 +482,13 @@ class textEditView(QTextEdit):
def createStandardContextMenu(self):
popup_menu = QTextEdit.createStandardContextMenu(self)
cursor = self.textCursor()
selectedWord = cursor.selectedText() if cursor.hasSelection() else None
if not self.spellcheck:
return popup_menu
cursor = self.textCursor()
suggestions = []
selectedWord = None
# Check for any suggestions for corrections at the cursors position
if self._dict != None:
@ -498,6 +499,8 @@ class textEditView(QTextEdit):
# Select the word under the cursor if necessary.
# But only if there is no selection (otherwise it's impossible to select more text to copy/cut)
if not cursor.hasSelection() and len(suggestions) == 0:
old_position = cursor.position()
cursor.select(QTextCursor.WordUnderCursor)
self.setTextCursor(cursor)
@ -507,8 +510,11 @@ class textEditView(QTextEdit):
# Check if the selected word is misspelled and offer spelling
# suggestions if it is.
suggestions = self._dict.findSuggestions(text, cursor.selectionStart(), cursor.selectionEnd())
elif cursor.hasSelection():
selectedWord = cursor.selectedText()
if len(suggestions) == 0:
cursor.clearSelection()
cursor.setPosition(old_position, QTextCursor.MoveAnchor)
self.setTextCursor(cursor)
if len(suggestions) > 0 or selectedWord != None:
valid = len(suggestions) == 0
@ -523,7 +529,7 @@ class textEditView(QTextEdit):
spell_menu = QMenu(self.tr('Spelling Suggestions'), self)
spell_menu.setIcon(F.themeIcon("spelling"))
if (match.end > match.start and not selectedWord):
if (match.end > match.start and selectedWord == None):
# Select the actual area of the match
cursor = self.textCursor()
cursor.setPosition(match.start, QTextCursor.MoveAnchor);