Reproog/novelWriter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix remaining merge conflict

Browse Source
This commit is contained in:
Veronica Berglyd Olsen
2022-09-29 20:00:05 +02:00
parent bf2229538e
commit a64c36221c
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
novelwriter/gui/doceditor.py
-8
View File
@@ -271,10 +271,7 @@ class GuiDocEditor(QTextEdit):
self.docHeader.matchColours() self.docHeader.matchColours()
self.docFooter.matchColours() self.docFooter.matchColours()
<<<<<<< HEAD
=======
# Set default text margins # Set default text margins
>>>>>>> main
# Due to cursor visibility, a part of the margin must be # Due to cursor visibility, a part of the margin must be
# allocated to the document itself. See issue #1112. # allocated to the document itself. See issue #1112.
cW = self.cursorWidth() cW = self.cursorWidth()
@@ -552,13 +549,8 @@ class GuiDocEditor(QTextEdit):
sH = hBar.height() if hBar.isVisible() else 0 sH = hBar.height() if hBar.isVisible() else 0
tM = self._vpMargin tM = self._vpMargin
<<<<<<< HEAD
if self.mainConf.textWidth > 0 or self.theParent.isFocusMode:
tW = self.mainConf.getTextWidth(self.theParent.isFocusMode)
=======
if self.mainConf.textWidth > 0 or self.mainGui.isFocusMode: if self.mainConf.textWidth > 0 or self.mainGui.isFocusMode:
tW = self.mainConf.getTextWidth(self.mainGui.isFocusMode) tW = self.mainConf.getTextWidth(self.mainGui.isFocusMode)
>>>>>>> main
tM = max((wW - sW - tW)//2, self._vpMargin) tM = max((wW - sW - tW)//2, self._vpMargin)
tB = self.frameWidth() tB = self.frameWidth()