• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28592 (tree)
Zeit2019-06-18 02:31:55
Autorstefankueng

Log Message

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.

Ändern Zusammenfassung

Diff

--- branches/1.12.x/src/Changelog.txt (revision 28591)
+++ branches/1.12.x/src/Changelog.txt (revision 28592)
@@ -5,6 +5,8 @@
55 the file with an escaped name. (Stefan)
66 - BUG: When parsing SVNParentPath pages, the
77 urls were not properly escaped. (Stefan)
8+- BUG: Context menu in TMerge didn't show up
9+ on secondary monitors. (Stefan)
810
911 Version 1.12.0
1012 - BUG: Ignoring comments in TMerge could
--- branches/1.12.x/src/TortoiseMerge/BaseView.cpp (revision 28591)
+++ branches/1.12.x/src/TortoiseMerge/BaseView.cpp (revision 28592)
@@ -2620,7 +2620,7 @@
26202620 int nViewBlockStart = -1;
26212621 int nViewBlockEnd = -1;
26222622 GetViewSelection(nViewBlockStart, nViewBlockEnd);
2623- if ((point.x >= 0) && (point.y >= 0))
2623+ if ((point.x != -1) || (point.y != -1))
26242624 {
26252625 int nLine = GetLineFromPoint(point)-1;
26262626 if ((nLine >= 0) && (nLine < m_Screen2View.size()))
Show on old repository browser