Skip to content

Conversation

@sdottaka
Copy link
Member

@sdottaka sdottaka commented Feb 22, 2024

This PR allows you to select the behavior when copying to another pane with "Copy to Right" etc. when text is selected.

image

refs #459, #1980


std::vector<WordDiff>
CMergeDoc::GetWordDiffArrayInRange(const int begin[3], const int end[3], int pane1/*=-1*/, int pane2/*=-1*/)
CMergeDoc::GetWordDiffArrayInRange(const int begin[3], const int end[3], bool ignoreDiffOptions/*=false*/, int pane1/*=-1*/, int pane2/*=-1*/)

Check notice

Code scanning / CodeQL

No raw arrays in interfaces

Raw arrays should not be used in interfaces. A container class should be used instead.
return ptMoved;
}

std::tuple<CEPoint, CEPoint, CEPoint, CEPoint> CMergeDoc::GetCharacterRange(int srcPane, int dstPane, int activePane, int nDiff,

Check warning

Code scanning / CodeQL

Poorly documented large function

Poorly documented function: fewer than 2% comments for a function of 147 lines.
@sdottaka sdottaka marked this pull request as ready for review March 3, 2024 01:57
@sdottaka sdottaka changed the title WIP Make it possible to select the behavior when copying to another pane with "Copy to Right" etc. when text is selected. Mar 3, 2024
@sdottaka sdottaka added this to the v2.16.39 milestone Mar 3, 2024
@sdottaka sdottaka changed the title Make it possible to select the behavior when copying to another pane with "Copy to Right" etc. when text is selected. Make it possible to select the behavior when copying to another pane with "Copy to Right" etc. while text is selected. Mar 3, 2024
@sdottaka sdottaka merged commit 360c354 into master Mar 3, 2024
@sdottaka sdottaka deleted the selectable-merge-key-behavior branch March 3, 2024 04:05
Marcellomco added a commit to Marcellomco/winmerge that referenced this pull request Mar 4, 2024
Added translation for "Make it possible to select the behavior when copying to another pane with 'Copy to Right' etc. while text is selected. (WinMerge#2224)"
@Marcellomco Marcellomco mentioned this pull request Mar 4, 2024
sdottaka pushed a commit that referenced this pull request Mar 4, 2024
Added translation for "Make it possible to select the behavior when copying to another pane with 'Copy to Right' etc. while text is selected. (#2224)"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants