On 14 May 2010 18:52, Piotr Piastucki <leech miranda gmail com> wrote: > Hi, > > Here is a new and improved version of the patch based on Kai's comments: > - popup_in_pane() changes moved to a separate patch Applied, thanks. > - new Changes menu Whoops... I didn't mean for you to do this. I actually had an slightly more extensive rework in a local branch, which I've just pushed. Sorry about the misunderstanding. > - proper sensitivity setting It's not ideal to have the sensitivity setting in on_current_diffs_changed; the sensitivity depends only on the conflicted state of the Differ and the current pane, whereas on_current_diffs_changed is called frequently (e.g., on cursor movements and such). Rather than recalculate the conflicted state here, how about putting it in Differ itself? I've attached a proof-of-concept patch (which is both ugly and *completely* untested). Thoughts? And finally, these actions are sensitive when we're in a two-pane comparison. Is this intended? I can't decide whether it's sensible or not. Kai
Attachment:
0001-Add-has_mergeable_changes-API.patch
Description: Binary data