Skip to content

Commit 1915de8

Browse files
committed
dirdiff: Move overlay scrolling disablement into builder file
1 parent a05a8bf commit 1915de8

2 files changed

Lines changed: 3 additions & 3 deletions

File tree

data/ui/filediff.ui

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -544,6 +544,7 @@
544544
<property name="vexpand">True</property>
545545
<property name="hexpand">True</property>
546546
<property name="vscrollbar_policy">always</property>
547+
<property name="overlay-scrolling">False</property>
547548
<property name="window_placement">top-right</property>
548549
<property name="window_placement_set">True</property>
549550
<signal name="size-allocate" handler="on_scrolledwindow_size_allocate" swapped="no"/>
@@ -594,6 +595,7 @@
594595
<property name="vexpand">True</property>
595596
<property name="hexpand">True</property>
596597
<property name="vscrollbar_policy">always</property>
598+
<property name="overlay-scrolling">False</property>
597599
<signal name="size-allocate" handler="on_scrolledwindow_size_allocate" swapped="no"/>
598600
<child>
599601
<object class="MeldSourceView" id="textview2">
@@ -642,6 +644,7 @@
642644
<property name="vexpand">True</property>
643645
<property name="hexpand">True</property>
644646
<property name="vscrollbar_policy">always</property>
647+
<property name="overlay-scrolling">False</property>
645648
<signal name="size-allocate" handler="on_scrolledwindow_size_allocate" swapped="no"/>
646649
<child>
647650
<object class="MeldSourceView" id="textview1">

meld/dirdiff.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -420,9 +420,6 @@ def __init__(self, num_panes):
420420
"value-changed", self._sync_vscroll)
421421
self.scrolledwindow[i].get_hadjustment().connect(
422422
"value-changed", self._sync_hscroll)
423-
# Revert overlay scrolling that messes with widget interactivity
424-
if hasattr(self.scrolledwindow[i], 'set_overlay_scrolling'):
425-
self.scrolledwindow[i].set_overlay_scrolling(False)
426423
self.linediffs = [[], []]
427424

428425
self.update_treeview_columns(settings, 'folder-columns')

0 commit comments

Comments
 (0)