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

Fix the document editor and viewer margins to fit better with the document title header

Browse Source
This commit is contained in:
Veronica K. B. Olsen
2020-05-26 18:40:58 +02:00
parent e7f0751275
commit 0f64c1fa7a
2 changed files with 20 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/gui/elements/doceditor.py
+8 -3
View File
@@ -85,7 +85,8 @@ class GuiDocEditor(QTextEdit):
# Document Title
self.docTitle = GuiDocTitleBar(self, self.theProject)
self.docTitle.setGeometry(0,0,self.docTitle.width(),self.docTitle.height())
self.docTitle.setGeometry(0, 0, self.docTitle.width(), self.docTitle.height())
self.setViewportMargins(0, self.docTitle.height(), 0, 0)
# Syntax
self.hLight = GuiDocHighlighter(self.qDocument, self.theParent)
@@ -336,13 +337,17 @@ class GuiDocEditor(QTextEdit):
tB = self.lineWidth()
tW = self.width() - 2*tB
tH = self.docTitle.height()
tT = tM - tH
self.docTitle.setGeometry(tB, tB, tW, tH)
self.setViewportMargins(0, tH, 0, 0)
docFormat = self.qDocument.rootFrame().frameFormat()
docFormat.setLeftMargin(tM)
docFormat.setRightMargin(tM)
if docFormat.topMargin() < tH:
docFormat.setTopMargin(tH + 2)
if tT > 0:
docFormat.setTopMargin(tT)
else:
docFormat.setTopMargin(0)
# Updating root frame triggers a QTextDocument->contentsChange
# signal, which we do not want as it re-runs the syntax
nw/gui/elements/docviewer.py
+12 -3
View File
@@ -59,7 +59,8 @@ class GuiDocViewer(QTextBrowser):
# Document Title
self.docTitle = GuiDocTitleBar(self, self.theProject)
self.docTitle.setGeometry(0,0,self.docTitle.width(),self.docTitle.height())
self.docTitle.setGeometry(0, 0, self.docTitle.width(), self.docTitle.height())
self.setViewportMargins(0, self.docTitle.height(), 0, 0)
theOpt = QTextOption()
if self.mainConf.doJustify:
@@ -218,11 +219,19 @@ class GuiDocViewer(QTextBrowser):
tB = self.lineWidth()
tW = self.width() - 2*tB
tH = self.docTitle.height()
tT = self.mainConf.textMargin - tH
self.docTitle.setGeometry(tB, tB, tW, tH)
self.setViewportMargins(0, tH, 0, 0)
docFormat = self.qDocument.rootFrame().frameFormat()
if docFormat.topMargin() < tH:
docFormat.setTopMargin(tH + 2)
if tT > 0:
docFormat.setTopMargin(tT)
else:
docFormat.setTopMargin(0)
self.qDocument.blockSignals(True)
self.qDocument.rootFrame().setFrameFormat(docFormat)
self.qDocument.blockSignals(False)
return