• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28285 (tree)
Time2018-07-13 03:32:11
Authorstefankueng

Log Message

Merged revision(s) r28280, r28281 from trunk:
* High-DPI adjustments: The CMFCFontComboBox is resized too small on high-dpi displays, so we adjust the height manually using the height of another combobox.
* Add the common control v6 manifest to TortoisePlink so the dialogs look more modern.

Change Summary

Incremental Difference

--- branches/1.10.x/ext/TortoisePlink/windows/TPlink/LoginDialog.cpp (revision 28284)
+++ branches/1.10.x/ext/TortoisePlink/windows/TPlink/LoginDialog.cpp (revision 28285)
@@ -1,6 +1,6 @@
11 // TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003, 2013-2014 - TortoiseSVN
3+// Copyright (C) 2003, 2013-2014, 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
@@ -20,6 +20,8 @@
2020 #include "TortoisePlinkRes.h"
2121 #include <string>
2222
23+#pragma comment(linker, "\"/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'\"")
24+
2325 HINSTANCE g_hmodThisDll;
2426 HWND g_hwndMain;
2527
--- branches/1.10.x/src/TortoiseMerge/SetMainPage.cpp (revision 28284)
+++ branches/1.10.x/src/TortoiseMerge/SetMainPage.cpp (revision 28285)
@@ -1,6 +1,6 @@
1-// TortoiseMerge - a Diff/Patch program
1+// TortoiseMerge - a Diff/Patch program
22
3-// Copyright (C) 2006-2010, 2012-2014, 2016 - TortoiseSVN
3+// Copyright (C) 2006-2010, 2012-2014, 2016, 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
@@ -206,6 +206,8 @@
206206 m_cFontNames.Setup(DEVICE_FONTTYPE|RASTER_FONTTYPE|TRUETYPE_FONTTYPE, 1, FIXED_PITCH);
207207 m_cFontNames.SelectFont(m_sFontName);
208208
209+ m_cFontNames.SendMessage(CB_SETITEMHEIGHT, (WPARAM)-1, m_cFontSizes.GetItemHeight(-1));
210+
209211 UpdateData(FALSE);
210212 return TRUE; // return TRUE unless you set the focus to a control
211213 // EXCEPTION: OCX Property Pages should return FALSE
--- branches/1.10.x/src/TortoiseProc/Settings/SetDialogs.cpp (revision 28284)
+++ branches/1.10.x/src/TortoiseProc/Settings/SetDialogs.cpp (revision 28285)
@@ -1,6 +1,6 @@
1-// TortoiseSVN - a Windows shell extension for easy version control
1+// TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2003-2009, 2011-2016 - TortoiseSVN
3+// Copyright (C) 2003-2009, 2011-2016, 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
@@ -174,6 +174,7 @@
174174
175175 m_cFontNames.Setup(DEVICE_FONTTYPE|RASTER_FONTTYPE|TRUETYPE_FONTTYPE, 1, FIXED_PITCH);
176176 m_cFontNames.SelectFont(m_sFontName);
177+ m_cFontNames.SendMessage(CB_SETITEMHEIGHT, (WPARAM)-1, m_cFontSizes.GetItemHeight(-1));
177178
178179 UpdateData(FALSE);
179180 return TRUE;
--- branches/1.10.x/src/TortoiseProc/Settings/SettingsTBlame.cpp (revision 28284)
+++ branches/1.10.x/src/TortoiseProc/Settings/SettingsTBlame.cpp (revision 28285)
@@ -1,6 +1,6 @@
1-// TortoiseSVN - a Windows shell extension for easy version control
1+// TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2007-2008, 2010-2014, 2016 - TortoiseSVN
3+// Copyright (C) 2007-2008, 2010-2014, 2016, 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
@@ -194,6 +194,7 @@
194194 }
195195 m_cFontNames.Setup(DEVICE_FONTTYPE|RASTER_FONTTYPE|TRUETYPE_FONTTYPE, 1, FIXED_PITCH);
196196 m_cFontNames.SelectFont(m_sFontName);
197+ m_cFontNames.SendMessage(CB_SETITEMHEIGHT, (WPARAM)-1, m_cFontSizes.GetItemHeight(-1));
197198
198199 UpdateData(FALSE);
199200 return TRUE;
--- branches/1.10.x/src/TortoiseProc/Settings/SettingsTUDiff.cpp (revision 28284)
+++ branches/1.10.x/src/TortoiseProc/Settings/SettingsTUDiff.cpp (revision 28285)
@@ -1,6 +1,6 @@
1-// TortoiseSVN - a Windows shell extension for easy version control
1+// TortoiseSVN - a Windows shell extension for easy version control
22
3-// Copyright (C) 2014, 2016 - TortoiseSVN
3+// Copyright (C) 2014, 2016, 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
@@ -181,6 +181,7 @@
181181 }
182182 m_cFontNames.Setup(DEVICE_FONTTYPE|RASTER_FONTTYPE|TRUETYPE_FONTTYPE, 1, FIXED_PITCH);
183183 m_cFontNames.SelectFont(m_sFontName);
184+ m_cFontNames.SendMessage(CB_SETITEMHEIGHT, (WPARAM)-1, m_cFontSizes.GetItemHeight(-1));
184185
185186 UpdateData(FALSE);
186187 return TRUE;
Show on old repository browser