Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix non-linear scrolling in the diff view

Browse Source
This commit is contained in:
Kovid Goyal 2014-01-26 16:53:07 +05:30
parent c6b9425571
commit 8088aad402
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/tweak_book/diff/view.py
View File

@ -823,7 +823,7 @@ class DiffView(QWidget): # {{{
@property @property
def syncpos(self): def syncpos(self):
return self.scrollbar.value() + int(self.scrollbar.pageStep() * self.SYNC_POSITION) return int(ceil(self.scrollbar.pageStep() * self.SYNC_POSITION))
def get_position_from_scrollbar(self, which): def get_position_from_scrollbar(self, which):
changes = (self.changes, self.view.left.changes, self.view.right.changes)[which] changes = (self.changes, self.view.left.changes, self.view.right.changes)[which]
@ -832,9 +832,12 @@ class DiffView(QWidget): # {{{
prev = (0, 0, None) prev = (0, 0, None)
for i, (top, bot, kind) in enumerate(changes): for i, (top, bot, kind) in enumerate(changes):
if syncpos <= bot: if syncpos <= bot:
if top <= syncpos and top != bot: if top <= syncpos:
# syncpos is inside a change # syncpos is inside a change
ratio = float(syncpos - top) / (bot - top) try:
ratio = float(syncpos - top) / (bot - top)
except ZeroDivisionError:
ratio = 0
return 'in', i, ratio return 'in', i, ratio
else: else:
# syncpos is after the change # syncpos is after the change
@ -850,7 +853,6 @@ class DiffView(QWidget): # {{{
def scroll_to(self, which, position): def scroll_to(self, which, position):
changes = (self.changes, self.view.left.changes, self.view.right.changes)[which] changes = (self.changes, self.view.left.changes, self.view.right.changes)[which]
bar = self.bars[which] bar = self.bars[which]
syncpos = self.syncpos
val = None val = None
if position[0] == 'in': if position[0] == 'in':
change_idx, ratio = position[1:] change_idx, ratio = position[1:]
@ -860,7 +862,7 @@ class DiffView(QWidget): # {{{
change_idx, offset = position[1:] change_idx, offset = position[1:]
start = 0 if change_idx < 0 else changes[change_idx][1] start = 0 if change_idx < 0 else changes[change_idx][1]
val = start + offset val = start + offset
bar.setValue(val - syncpos) bar.setValue(val - self.syncpos)
def scrolled(self, which, *args): def scrolled(self, which, *args):
if self.syncing: if self.syncing: