• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Révision28593 (tree)
l'heure2019-06-18 02:32:51
Auteurstefankueng

Message de Log

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.

Change Summary

Modification

--- branches/1.10.x/src/Changelog.txt (revision 28592)
+++ branches/1.10.x/src/Changelog.txt (revision 28593)
@@ -3,6 +3,8 @@
33 the file with an escaped name. (Stefan)
44 - BUG: When parsing SVNParentPath pages, the
55 urls were not properly escaped. (Stefan)
6+- BUG: Context menu in TMerge didn't show up
7+ on secondary monitors. (Stefan)
68
79 Version 1.10.2
810 - BUG: Display issues in the log dialog when
--- branches/1.10.x/src/TortoiseMerge/BaseView.cpp (revision 28592)
+++ branches/1.10.x/src/TortoiseMerge/BaseView.cpp (revision 28593)
@@ -1,6 +1,6 @@
11 // TortoiseMerge - a Diff/Patch program
22
3-// Copyright (C) 2003-2018 - TortoiseSVN
3+// Copyright (C) 2003-2019 - TortoiseSVN
44
55 // This program is free software; you can redistribute it and/or
66 // modify it under the terms of the GNU General Public License
@@ -2632,7 +2632,7 @@
26322632 int nViewBlockStart = -1;
26332633 int nViewBlockEnd = -1;
26342634 GetViewSelection(nViewBlockStart, nViewBlockEnd);
2635- if ((point.x >= 0) && (point.y >= 0))
2635+ if ((point.x != -1) || (point.y != -1))
26362636 {
26372637 int nLine = GetLineFromPoint(point)-1;
26382638 if ((nLine >= 0) && (nLine < m_Screen2View.size()))
Afficher sur ancien navigateur de dépôt.