May 25, 2018 updates: Privacy Policy
  • R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28206 (tree)
Time2018-04-25 02:53:02
Authorstefankueng

Log Message

Merged revision(s) r28204, r28205 from trunk:
* Fix high-dpi issues with the udiff viewer.
* Use the correct titles for passing them to the external merge tool.

Change Summary

Incremental Difference

--- branches/1.10.x/src/TortoiseUDiff/MainWindow.cpp (revision 28205)
+++ branches/1.10.x/src/TortoiseUDiff/MainWindow.cpp (revision 28206)
@@ -26,6 +26,7 @@
2626 #include "CreateProcessHelper.h"
2727 #include "UDiffColors.h"
2828 #include "registry.h"
29+#include "DPIAware.h"
2930 #include <VersionHelpers.h>
3031
3132 const UINT TaskBarButtonCreated = RegisterWindowMessage(L"TaskbarButtonCreated");
@@ -114,11 +115,11 @@
114115 {
115116 ::SetWindowPos(m_hWndEdit, HWND_TOP,
116117 rect.left, rect.top,
117- rect.right-rect.left, rect.bottom-rect.top-30,
118+ rect.right - rect.left, rect.bottom - rect.top - int(30 * CDPIAware::Instance().ScaleFactorY()),
118119 SWP_SHOWWINDOW);
119120 ::SetWindowPos(m_FindBar, HWND_TOP,
120- rect.left, rect.bottom-30,
121- rect.right-rect.left, 30,
121+ rect.left, rect.bottom - int(30 * CDPIAware::Instance().ScaleFactorY()),
122+ rect.right - rect.left, int(30 * CDPIAware::Instance().ScaleFactorY()),
122123 SWP_SHOWWINDOW);
123124 }
124125 else
@@ -215,11 +216,11 @@
215216 GetClientRect(*this, &rect);
216217 ::SetWindowPos(m_hWndEdit, HWND_TOP,
217218 rect.left, rect.top,
218- rect.right-rect.left, rect.bottom-rect.top-30,
219+ rect.right - rect.left, rect.bottom - rect.top - int(30 * CDPIAware::Instance().ScaleFactorY()),
219220 SWP_SHOWWINDOW);
220221 ::SetWindowPos(m_FindBar, HWND_TOP,
221- rect.left, rect.bottom-30,
222- rect.right-rect.left, 30,
222+ rect.left, rect.bottom - int(30 * CDPIAware::Instance().ScaleFactorY()),
223+ rect.right - rect.left, int(30 * CDPIAware::Instance().ScaleFactorY()),
223224 SWP_SHOWWINDOW);
224225 ::SetFocus(m_FindBar);
225226 SendEditor(SCI_SETSELECTIONSTART, 0);
--- branches/1.10.x/src/TortoiseProc/Commands/ConflictEditorCommand.cpp (revision 28205)
+++ branches/1.10.x/src/TortoiseProc/Commands/ConflictEditorCommand.cpp (revision 28206)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2008-2014, 2017 - TortoiseSVN
3+// Copyright (C) 2008-2014, 2017-2018 - 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
@@ -95,8 +95,16 @@
9595 conflict.GetTextContentFiles(base, theirs, mine);
9696 if (mine.IsEmpty())
9797 mine = merge;
98+
99+ CString filename, n1, n2, n3, n4;
100+ filename = merge.GetUIFileOrDirectoryName();
101+ n1.Format(IDS_DIFF_BASENAME, (LPCTSTR)filename);
102+ n2.Format(IDS_DIFF_REMOTENAME, (LPCTSTR)filename);
103+ n3.Format(IDS_DIFF_WCNAME, (LPCTSTR)filename);
104+ n4.Format(IDS_DIFF_MERGEDNAME, (LPCTSTR)filename);
105+
98106 bRet = !!CAppUtils::StartExtMerge(CAppUtils::MergeFlags().AlternativeTool(bAlternativeTool),
99- base, theirs, mine, merge, true, CString(), CString(), CString(), CString(), merge.GetFileOrDirectoryName());
107+ base, theirs, mine, merge, true, n1, n2, n3, n4, filename);
100108 }
101109
102110 for (int i = 0; i < conflict.GetPropConflictCount(); ++i)
--- branches/1.10.x/src/TortoiseProc/TextConflictEditorDlg.cpp (revision 28205)
+++ branches/1.10.x/src/TortoiseProc/TextConflictEditorDlg.cpp (revision 28206)
@@ -100,9 +100,9 @@
100100
101101 CString filename, n1, n2, n3, n4;
102102 filename = m_merged.GetUIFileOrDirectoryName();
103- n1.Format(IDS_DIFF_WCNAME, (LPCTSTR)filename);
104- n2.Format(IDS_DIFF_BASENAME, (LPCTSTR)filename);
105- n3.Format(IDS_DIFF_REMOTENAME, (LPCTSTR)filename);
103+ n1.Format(IDS_DIFF_BASENAME, (LPCTSTR)filename);
104+ n2.Format(IDS_DIFF_REMOTENAME, (LPCTSTR)filename);
105+ n3.Format(IDS_DIFF_WCNAME, (LPCTSTR)filename);
106106 n4.Format(IDS_DIFF_MERGEDNAME, (LPCTSTR)filename);
107107
108108 CAppUtils::MergeFlags flags;
@@ -109,7 +109,7 @@
109109 flags.AlternativeTool((GetKeyState(VK_SHIFT) & 0x8000) != 0);
110110 flags.PreventSVNResolve(true);
111111 CAppUtils::StartExtMerge(flags,
112- base, theirs, mine, m_merged, true, n1, n1, n3, n4, filename);
112+ base, theirs, mine, m_merged, true, n1, n2, n3, n4, filename);
113113 return S_FALSE;
114114 }
115115 for (SVNConflictOptions::const_iterator it = m_options.begin(); it != m_options.end(); ++it)
--- branches/1.10.x/src/TortoiseProc/PropConflictEditorDlg.cpp (revision 28205)
+++ branches/1.10.x/src/TortoiseProc/PropConflictEditorDlg.cpp (revision 28206)
@@ -97,9 +97,9 @@
9797 ::SendMessage(hWnd, TDM_ENABLE_BUTTON, 100 + svn_client_conflict_option_merged_text, 0);
9898
9999 CString n1, n2, n3, n4;
100- n1.Format(IDS_DIFF_PROP_WCNAME, (LPCTSTR)m_propName);
101- n2.Format(IDS_DIFF_PROP_BASENAME, (LPCTSTR)m_propName);
102- n3.Format(IDS_DIFF_PROP_REMOTENAME, (LPCTSTR)m_propName);
100+ n1.Format(IDS_DIFF_PROP_BASENAME, (LPCTSTR)m_propName);
101+ n2.Format(IDS_DIFF_PROP_REMOTENAME, (LPCTSTR)m_propName);
102+ n3.Format(IDS_DIFF_PROP_WCNAME, (LPCTSTR)m_propName);
103103 n4.Format(IDS_DIFF_PROP_MERGENAME, (LPCTSTR)m_propName);
104104
105105 CAppUtils::MergeFlags flags;
--- branches/1.10.x/src/Changelog.txt (revision 28205)
+++ branches/1.10.x/src/Changelog.txt (revision 28206)
@@ -7,6 +7,7 @@
77 an outdated or corrupted working copy. (Stefan)
88 - CHG: Improved project monitor toolbar for
99 high dpi monitors. (Stefan)
10+- BUG: Wrong titles when editing a conflict. (Stefan)
1011
1112 Version 1.10.0
1213 See the release notes here:
Show on old repository browser