Commit 529f257e authored by Kai Willadsen's avatar Kai Willadsen

dirdiff, filediff: Add a hack to revert overlay scrolling (bgo#748219)

In some cases, overlay scrolling appears to mess with the ability to
interact with, for example, Meld's merge buttons. As such, this patch
reverts to using old-style scrollbars for folder and file comparisons,
since they're the ones likely to be affected.

It might actually be quite nice for Meld to enable these, if this gets
fixed or we can figure out a different workaround.
parent 2d60d11f
...@@ -421,6 +421,9 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component): ...@@ -421,6 +421,9 @@ class DirDiff(melddoc.MeldDoc, gnomeglade.Component):
"value-changed", self._sync_vscroll) "value-changed", self._sync_vscroll)
self.scrolledwindow[i].get_hadjustment().connect( self.scrolledwindow[i].get_hadjustment().connect(
"value-changed", self._sync_hscroll) "value-changed", self._sync_hscroll)
# Revert overlay scrolling that messes with widget interactivity
if hasattr(self.scrolledwindow[i], 'set_overlay_scrolling'):
self.linediffs = [[], []] self.linediffs = [[], []]
self.update_treeview_columns(settings, 'folder-columns') self.update_treeview_columns(settings, 'folder-columns')
...@@ -225,6 +225,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component): ...@@ -225,6 +225,9 @@ class FileDiff(melddoc.MeldDoc, gnomeglade.Component):
for (i, w) in enumerate(self.scrolledwindow): for (i, w) in enumerate(self.scrolledwindow):
w.get_vadjustment().connect("value-changed", self._sync_vscroll, i) w.get_vadjustment().connect("value-changed", self._sync_vscroll, i)
w.get_hadjustment().connect("value-changed", self._sync_hscroll) w.get_hadjustment().connect("value-changed", self._sync_hscroll)
# Revert overlay scrolling that messes with widget interactivity
if hasattr(w, 'set_overlay_scrolling'):
self._connect_buffer_handlers() self._connect_buffer_handlers()
self._sync_vscroll_lock = False self._sync_vscroll_lock = False
self._sync_hscroll_lock = False self._sync_hscroll_lock = False
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment