CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-17 11:22:28 +12:00
Code Issues Projects Releases Wiki Activity

Fixes fullScreen scrollbar range

Browse source
This commit is contained in:
Olivier Keshavjee 2017-11-28 19:58:23 +01:00
parent 91989269f1
commit c504cb510e
2 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
manuskript/ui/editors/fullScreenEditor.py
View file

@ -206,6 +206,7 @@ class fullScreenEditor(QWidget):
# self.lblWC.setPalette(p)
self.update()
self.editor.centerCursor()
def paintEvent(self, event):
if self._background:
@ -307,10 +308,21 @@ class myScrollBar(QScrollBar):
self.timer.timeout.connect(lambda: self.parent().hideWidget(self))
self.valueChanged.connect(lambda v: self.timer.start())
self.valueChanged.connect(lambda: self.parent().showWidget(self))
self.rangeChanged.connect(self.rangeHasChanged)
def setColor(self, color):
self._color = color
def rangeHasChanged(self, min, max):
"""
Adds viewport height to scrollbar max so that we can center cursor
on screen.
"""
if settings.textEditor["alwaysCenter"]:
self.blockSignals(True)
self.setMaximum(max + self.parent().height())
self.blockSignals(False)
def paintEvent(self, event):
opt = QStyleOptionSlider()
self.initStyleOption(opt)

6
manuskript/ui/views/MDEditView.py
View file

@ -51,17 +51,21 @@ class MDEditView(textEditView):
# TypeWriterScrolling
###########################################################################
def setCurrentModelIndex(self, index):
textEditView.setCurrentModelIndex(self, index)
self.centerCursor()
def cursorPositionHasChanged(self):
self.centerCursor()
def centerCursor(self, force=False):
cursor = self.cursorRect()
scrollbar = self.verticalScrollBar()
viewport = self.viewport().rect()
if (force or settings.textEditor["alwaysCenter"]
or cursor.bottom() >= viewport.bottom()
or cursor.top() <= viewport.top()):
offset = viewport.center() - cursor.center()
scrollbar = self.verticalScrollBar()
scrollbar.setValue(scrollbar.value() - offset.y())
def scrollBarRangeChanged(self, min, max):