| Revision | 28592 (tree) |
|---|---|
| Zeit | 2019-06-18 02:31:55 |
| Autor | stefankueng |
Merged revision(s) r28591 from trunk:
* Only check for -1 coordinates for the context menu: negative coordinates are possible on multi-monitor setups, but only -1 for x and y coordinates indicate keyboard activation.
branches/1.12.x/src/Changelog.txt (diff)
branches/1.12.x/src/TortoiseMerge/BaseView.cpp (diff)
branches/1.12.x/src branches/1.12.x| @@ -5,6 +5,8 @@ | ||
| 5 | 5 | the file with an escaped name. (Stefan) |
| 6 | 6 | - BUG: When parsing SVNParentPath pages, the |
| 7 | 7 | urls were not properly escaped. (Stefan) |
| 8 | +- BUG: Context menu in TMerge didn't show up | |
| 9 | + on secondary monitors. (Stefan) | |
| 8 | 10 | |
| 9 | 11 | Version 1.12.0 |
| 10 | 12 | - BUG: Ignoring comments in TMerge could |
| @@ -2620,7 +2620,7 @@ | ||
| 2620 | 2620 | int nViewBlockStart = -1; |
| 2621 | 2621 | int nViewBlockEnd = -1; |
| 2622 | 2622 | GetViewSelection(nViewBlockStart, nViewBlockEnd); |
| 2623 | - if ((point.x >= 0) && (point.y >= 0)) | |
| 2623 | + if ((point.x != -1) || (point.y != -1)) | |
| 2624 | 2624 | { |
| 2625 | 2625 | int nLine = GetLineFromPoint(point)-1; |
| 2626 | 2626 | if ((nLine >= 0) && (nLine < m_Screen2View.size())) |
TortoiseSVN