Backport fix #1113

Author: vkbo

novelwriter/gui/doceditor.py

@@ -91,6 +91,7 @@ def __init__(self, theParent):
 
         self._spellCheck = False  # Flag for spell checking enabled
         self._nonWord    = "\"'"  # Characters to not include in spell checking
+        self._vpMargin   = 0      # The editor viewport margin, set during init
 
         # Document Variables
         self._charCount  = 0      # Character count
@@ -268,10 +269,12 @@ def initEditor(self):
         self.docHeader.matchColours()
         self.docFooter.matchColours()
 
-        # Set default text margins
-        cM = self.mainConf.getTextMargin()
-        qDoc.setDocumentMargin(0)
-        self.setViewportMargins(cM, cM, cM, cM)
+        # Due to cursor visibility, a part of the margin must be
+        # allocated to the document itself. See issue #1112.
+        cW = self.cursorWidth()
+        qDoc.setDocumentMargin(cW)
+        self._vpMargin = max(self.mainConf.getTextMargin() - cW, 0)
+        self.setViewportMargins(self._vpMargin, self._vpMargin, self._vpMargin, self._vpMargin)
 
         # Also set the document text options for the document text flow
         theOpt = QTextOption()
@@ -533,18 +536,17 @@ def updateDocMargins(self):
         """
         wW = self.width()
         wH = self.height()
-        cM = self.mainConf.getTextMargin()
 
         vBar = self.verticalScrollBar()
         sW = vBar.width() if vBar.isVisible() else 0
 
         hBar = self.horizontalScrollBar()
         sH = hBar.height() if hBar.isVisible() else 0
 
-        tM = cM
+        tM = self._vpMargin
         if self.mainConf.textWidth > 0 or self.theParent.isFocusMode:
             tW = self.mainConf.getTextWidth(self.theParent.isFocusMode)
-            tM = max((wW - sW - tW)//2, cM)
+            tM = max((wW - sW - tW)//2, self._vpMargin)
 
         tB = self.frameWidth()
         tW = wW - 2*tB - sW
@@ -561,8 +563,8 @@ def updateDocMargins(self):
             rL = wW - sW - rW - 2*tB
             self.docSearch.move(rL, 2*tB)
 
-        uM = max(cM, tH, rH)
-        lM = max(cM, fH)
+        uM = max(self._vpMargin, tH, rH)
+        lM = max(self._vpMargin, fH)
         self.setViewportMargins(tM, uM, tM, lM)
 
         return