Skip to content
This repository has been archived by the owner on Nov 8, 2017. It is now read-only.

[wip] Changes going nuts #87

Merged
merged 3 commits into from
Nov 8, 2014
Merged

[wip] Changes going nuts #87

merged 3 commits into from
Nov 8, 2014

Conversation

smashwilson
Copy link
Owner

As demonstrated in #79, SideView.reposition() wasn't taking the current scroll position into account, which was doing bizarre things to SideView placement whenever a reposition() was triggered.

  • Handle the current scrolling offset when repositioning SideViews.
  • Stale decoration classes are being left on lines corresponding to a resolved conflict.

smashwilson added a commit that referenced this pull request Nov 8, 2014
@smashwilson smashwilson merged commit cd2f0bc into master Nov 8, 2014
@smashwilson smashwilson deleted the changes-going-nuts branch November 8, 2014 20:20
@smashwilson smashwilson mentioned this pull request Nov 14, 2014
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant