[meld] dirdiff: Move overlay scrolling disablement into builder file



commit 1915de8d4c375f8c2e6aa525ae41206a5d71587b
Author: Kai Willadsen <kai willadsen gmail com>
Date:   Fri Mar 31 06:57:01 2017 +1000

    dirdiff: Move overlay scrolling disablement into builder file

 data/ui/filediff.ui |    3 +++
 meld/dirdiff.py     |    3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/data/ui/filediff.ui b/data/ui/filediff.ui
index bfdc94d..3765f46 100644
--- a/data/ui/filediff.ui
+++ b/data/ui/filediff.ui
@@ -544,6 +544,7 @@
                     <property name="vexpand">True</property>
                     <property name="hexpand">True</property>
                     <property name="vscrollbar_policy">always</property>
+                    <property name="overlay-scrolling">False</property>
                     <property name="window_placement">top-right</property>
                     <property name="window_placement_set">True</property>
                     <signal name="size-allocate" handler="on_scrolledwindow_size_allocate" swapped="no"/>
@@ -594,6 +595,7 @@
                     <property name="vexpand">True</property>
                     <property name="hexpand">True</property>
                     <property name="vscrollbar_policy">always</property>
+                    <property name="overlay-scrolling">False</property>
                     <signal name="size-allocate" handler="on_scrolledwindow_size_allocate" swapped="no"/>
                     <child>
                       <object class="MeldSourceView" id="textview2">
@@ -642,6 +644,7 @@
                     <property name="vexpand">True</property>
                     <property name="hexpand">True</property>
                     <property name="vscrollbar_policy">always</property>
+                    <property name="overlay-scrolling">False</property>
                     <signal name="size-allocate" handler="on_scrolledwindow_size_allocate" swapped="no"/>
                     <child>
                       <object class="MeldSourceView" id="textview1">
diff --git a/meld/dirdiff.py b/meld/dirdiff.py
index f521f9d..a4e331f 100644
--- a/meld/dirdiff.py
+++ b/meld/dirdiff.py
@@ -420,9 +420,6 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
                 "value-changed", self._sync_vscroll)
             self.scrolledwindow[i].get_hadjustment().connect(
                 "value-changed", self._sync_hscroll)
-            # Revert overlay scrolling that messes with widget interactivity
-            if hasattr(self.scrolledwindow[i], 'set_overlay_scrolling'):
-                self.scrolledwindow[i].set_overlay_scrolling(False)
         self.linediffs = [[], []]
 
         self.update_treeview_columns(settings, 'folder-columns')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]