Fix regression in scroll handling

Authored by Lekensteyn on Sep 10 2018, 4:51 PM.



Before commit de87cab0d2d2 ("Apply some clazzy fixes"), the "scroll"
method was overloaded as signal to set the correct position in the main
view. After that change, this subtle override is gone. The last trace
was removed in commit f136b953f4e3 ("remove broken connects").

Restore the original behavior with renamed signals to avoid confusion.

Test Plan

Run git mergetool to resolve conflicts, this opens kdiff3. Observe that now:

  1. the different lines are now scrolled into view.
  2. scrolling with the mouse wheel in the bottom view (the merge result) now actually works.

Diff Detail

R983 KDiff3
Automatic diff as part of commit; lint not applicable.
Automatic diff as part of commit; unit tests not applicable.
Lekensteyn requested review of this revision.Sep 10 2018, 4:51 PM
Lekensteyn created this revision.
mreeves accepted this revision.Sep 11 2018, 12:55 AM


This revision is now accepted and ready to land.Sep 11 2018, 12:55 AM
This revision was automatically updated to reflect the committed changes.