ahamilton/diff-edit
1
0
Fork 0
Code Releases Activity

Fix crashes during scrolling

Browse source 
- Occured due to negative scroll positions or not finding the
  equivalent line in the other editor.
This commit is contained in:
Andrew Hamilton 2022-03-08 10:06:47 +10:00
parent 7986f1c7d9
commit 87e62e8570
3 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
diff_edit/__init__.py
View file

@ -182,15 +182,14 @@ class DiffEditor:
if left_start <= y < left_end:
fraction = (y - left_start) / (left_end - left_start)
return round(right_start + fraction * (right_end - right_start))
return 0
def follow_scroll(self):
x, y = self.editors[0].scroll_position
last_width, last_height = self.last_dimensions
middle_y = last_height // 2
new_y = self._equivalent_line(y + middle_y)
if new_y is None:
new_y = 0
self.editors[1].scroll_position = max(0, x), new_y - middle_y
self.editors[1].scroll_position = max(0, x), max(0, new_y - middle_y)
def switch_editor(self):
self.editors[1].cursor_x = self.editors[0].cursor_x

2
diff_edit/editor.py
View file

@ -658,7 +658,7 @@ class Editor:
def scroll(self, dx, dy):
view_x, view_y = self.scroll_position
self.scroll_position = view_x + dx, view_y + dy
self.scroll_position = max(0, view_x + dx), max(0, view_y + dy)
def on_mouse_press(self, x, y):
view_x, view_y = self.view_widget.position