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

Merge pull request #593 from vkbo/minor_fixes

Browse Source 
Minor Fixes
This commit is contained in:
Veronica K. Berglyd Olsen
2021-01-23 14:21:20 +00:00
committed by GitHub
parent 31b29abf5f 86fa59e5e1
commit 98bf462e02
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nw/gui/doceditor.py
+2 -2
View File
@@ -455,7 +455,7 @@ class GuiDocEditor(QTextEdit):
docChanged = self.docChanged docChanged = self.docChanged
if self.mainConf.scrollPastEnd: if self.mainConf.scrollPastEnd:
docFrame = self.qDocument.rootFrame().frameFormat() docFrame = self.qDocument.rootFrame().frameFormat()
docFrame.setBottomMargin(max(0, 0.6*(wH - uM - lM - 4*tB))) docFrame.setBottomMargin(max(0, 0.9*(wH - uM - lM - 4*tB)))
self.qDocument.rootFrame().setFrameFormat(docFrame) self.qDocument.rootFrame().setFrameFormat(docFrame)
# This is needed as the setFrameFormat function itself will # This is needed as the setFrameFormat function itself will
@@ -847,7 +847,7 @@ class GuiDocEditor(QTextEdit):
if okMod and okKey: if okMod and okKey:
cNew = self.cursorRect().center().y() cNew = self.cursorRect().center().y()
cMov = cNew - cOld cMov = cNew - cOld
mPos = self.mainConf.autoScrollPos * self.viewport().height() * 0.01 mPos = self.mainConf.autoScrollPos*0.01 * self.viewport().height()
if abs(cMov) > 0 and cOld > mPos: if abs(cMov) > 0 and cOld > mPos:
# Move the scroll bar # Move the scroll bar
vBar = self.verticalScrollBar() vBar = self.verticalScrollBar()
setup/win_setup_pyz.iss
+1 -1
View File
@@ -27,7 +27,7 @@ UsedUserAreasWarning=no
;PrivilegesRequired=lowest ;PrivilegesRequired=lowest
PrivilegesRequiredOverridesAllowed=dialog PrivilegesRequiredOverridesAllowed=dialog
OutputDir={#nwAppDir} OutputDir={#nwAppDir}
OutputBaseFilename=novelwriter-{#nwAppVersion}-win10-amd64-setup OutputBaseFilename=novelwriter-{#nwAppVersion}-win10-amd64-pyz-setup
Compression=lzma Compression=lzma
SolidCompression=yes SolidCompression=yes
WizardStyle=modern WizardStyle=modern