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

Merge pull request #434 from vkbo/issue433_move-footer-on-hscroll

Browse Source 
Issue #433: Move footer if horisontal scroll bar appears
This commit is contained in:
Veronica K. Berglyd Olsen
2020-08-31 17:44:49 +02:00
committed by GitHub
parent abd777026e aefb4e782c
commit f4ba9e8304
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/gui/doceditor.py
+5 -5
View File
@@ -334,10 +334,10 @@ class GuiDocEditor(QTextEdit):
cM = self.mainConf.getTextMargin()
vBar = self.verticalScrollBar()
if vBar.isVisible():
sW = vBar.width()
else:
sW = 0
sW = vBar.width() if vBar.isVisible() else 0
hBar = self.horizontalScrollBar()
sH = hBar.height() if hBar.isVisible() else 0
if self.mainConf.textFixedW or self.theParent.isFocusMode:
if self.theParent.isFocusMode:
@@ -354,7 +354,7 @@ class GuiDocEditor(QTextEdit):
tW = wW - 2*tB - sW
tH = self.docHeader.height()
fH = self.docFooter.height()
fY = self.height() - fH - tB
fY = self.height() - fH - tB - sH
self.docHeader.setGeometry(tB, tB, tW, tH)
self.docFooter.setGeometry(tB, fY, tW, fH)
nw/gui/docviewer.py
+5 -5
View File
@@ -250,17 +250,17 @@ class GuiDocViewer(QTextBrowser):
just ensure the margins are set correctly.
"""
vBar = self.verticalScrollBar()
if vBar.isVisible():
sW = vBar.width()
else:
sW = 0
sW = vBar.width() if vBar.isVisible() else 0
hBar = self.horizontalScrollBar()
sH = hBar.height() if hBar.isVisible() else 0
cM = self.mainConf.getTextMargin()
tB = self.frameWidth()
tW = self.width() - 2*tB - sW
tH = self.docHeader.height()
fH = self.docFooter.height()
fY = self.height() - fH - tB
fY = self.height() - fH - tB - sH
self.docHeader.setGeometry(tB, tB, tW, tH)
self.docFooter.setGeometry(tB, fY, tW, fH)