Skip to content

Commit 573bdb7

Browse files
committed
filediff, dirdiff: Fix busted overlay scrolling change
The change in 1915de was supposed to just move overlay scrolling disablement for dirdiff; instead it moved it for filediff and removed it for dirdiff. This is the other part of the changeset, removing the lagging code in filediff and actually disabling overlay scrolling in dirdiff in the UI file.
1 parent 033cae9 commit 573bdb7

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

data/ui/dirdiff.ui

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,7 @@
353353
<property name="visible">True</property>
354354
<property name="can_focus">True</property>
355355
<property name="vexpand">True</property>
356+
<property name="overlay-scrolling">False</property>
356357
<property name="window_placement">top-right</property>
357358
<property name="window_placement_set">True</property>
358359
<child>
@@ -411,6 +412,7 @@
411412
<property name="visible">True</property>
412413
<property name="can_focus">True</property>
413414
<property name="vexpand">True</property>
415+
<property name="overlay-scrolling">False</property>
414416
<child>
415417
<object class="GtkTreeView" id="treeview1">
416418
<property name="visible">True</property>
@@ -467,6 +469,7 @@
467469
<property name="visible">True</property>
468470
<property name="can_focus">True</property>
469471
<property name="vexpand">True</property>
472+
<property name="overlay-scrolling">False</property>
470473
<child>
471474
<object class="GtkTreeView" id="treeview2">
472475
<property name="visible">True</property>

meld/filediff.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,9 +172,6 @@ def __init__(self, num_panes):
172172
for (i, w) in enumerate(self.scrolledwindow):
173173
w.get_vadjustment().connect("value-changed", self._sync_vscroll, i)
174174
w.get_hadjustment().connect("value-changed", self._sync_hscroll)
175-
# Revert overlay scrolling that messes with widget interactivity
176-
if hasattr(w, 'set_overlay_scrolling'):
177-
w.set_overlay_scrolling(False)
178175
self._connect_buffer_handlers()
179176
self._sync_vscroll_lock = False
180177
self._sync_hscroll_lock = False

0 commit comments

Comments
 (0)