• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28941 (tree)
Time2020-06-26 02:56:09
Authorstefankueng

Log Message

partly revert r28940: the commit contained dev changes that were not part of the expat update.

Change Summary

Incremental Difference

--- trunk/src/TortoiseIDiff/PicWindow.cpp (revision 28940)
+++ trunk/src/TortoiseIDiff/PicWindow.cpp (revision 28941)
@@ -586,7 +586,7 @@
586586 {
587587 const auto header_height = CDPIAware::Instance().Scale(*this, HEADER_HEIGHT);
588588 HFONT hFont = nullptr;
589- hFont = CreateFont(-CDPIAware::Instance().PointsToPixels(*this, pSecondPic ? 9 : 10), 0, 0, 0, FW_DONTCARE, false, false, false, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, CLEARTYPE_QUALITY, DEFAULT_PITCH, L"Segoe UI");
589+ hFont = CreateFont(-CDPIAware::Instance().PointsToPixels(*this, pSecondPic ? 8 : 10), 0, 0, 0, FW_DONTCARE, false, false, false, ANSI_CHARSET, OUT_DEFAULT_PRECIS, CLIP_DEFAULT_PRECIS, CLEARTYPE_QUALITY, DEFAULT_PITCH, L"MS Shell Dlg");
590590 HFONT hFontOld = (HFONT)SelectObject(hDC, (HGDIOBJ)hFont);
591591
592592 RECT textrect;
--- trunk/src/TortoiseMerge/Settings.cpp (revision 28940)
+++ trunk/src/TortoiseMerge/Settings.cpp (revision 28941)
@@ -32,7 +32,7 @@
3232 {
3333 LPDLGTEMPLATE pResource = (LPDLGTEMPLATE)lParam;
3434 CDialogTemplate dlgTemplate(pResource);
35- dlgTemplate.SetFont(L"Segoe UI", 9);
35+ dlgTemplate.SetFont(L"MS Shell Dlg 2", 9);
3636 memmove((void*)lParam, dlgTemplate.m_hTemplate, dlgTemplate.m_dwTemplateSize);
3737 }
3838 break;
--- trunk/src/TortoiseMerge/Settings.h (revision 28940)
+++ trunk/src/TortoiseMerge/Settings.h (revision 28941)
@@ -65,7 +65,7 @@
6565 {
6666 const DLGTEMPLATE* pResource = ppsp->pResource;
6767 CDialogTemplate dlgTemplate(pResource);
68- dlgTemplate.SetFont(L"Segoe UI", 9);
68+ dlgTemplate.SetFont(L"MS Shell Dlg 2", 9);
6969 HGLOBAL hNew = GlobalAlloc(GPTR, dlgTemplate.m_dwTemplateSize);
7070 ppsp->pResource = (DLGTEMPLATE*)GlobalLock(hNew);
7171 Checked::memcpy_s((void*)ppsp->pResource, dlgTemplate.m_dwTemplateSize, dlgTemplate.m_hTemplate, dlgTemplate.m_dwTemplateSize);
--- trunk/src/TortoiseProc/RevisionGraph/RevisionGraphDlgDraw.cpp (revision 28940)
+++ trunk/src/TortoiseProc/RevisionGraph/RevisionGraphDlgDraw.cpp (revision 28941)
@@ -60,7 +60,7 @@
6060 m_lfBaseFont.lfHeight = -CDPIAware::Instance().PointsToPixels(GetSafeHwnd(), m_nFontSize);
6161 // use the empty font name, so GDI takes the first font which matches
6262 // the specs. Maybe this will help render chinese/japanese chars correctly.
63- wcsncpy_s(m_lfBaseFont.lfFaceName, L"Segoe UI", _countof(m_lfBaseFont.lfFaceName) - 1);
63+ wcsncpy_s(m_lfBaseFont.lfFaceName, L"MS Shell Dlg 2", _countof(m_lfBaseFont.lfFaceName) - 1);
6464 if (!m_apFonts[nIndex]->CreateFontIndirect(&m_lfBaseFont))
6565 {
6666 delete m_apFonts[nIndex];
Show on old repository browser