浏览代码

Fixing ThemeDefaultFontSize counter after DefaultFont change in e55f27da

Source commit: c427a006cabb5892ff981110bc8769e495aca3d2
Martin Prikryl 1 年之前
父节点
当前提交
64b618621c
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 0
      source/WinSCP.cpp
  2. 1 1
      source/windows/WinMain.cpp

+ 1 - 0
source/WinSCP.cpp

@@ -62,6 +62,7 @@ WINAPI wWinMain(HINSTANCE, HINSTANCE, LPWSTR, int)
     Application->Initialize();
     Application->Initialize();
     Application->MainFormOnTaskBar = true;
     Application->MainFormOnTaskBar = true;
     Application->ModalPopupMode = pmAuto;
     Application->ModalPopupMode = pmAuto;
+    DebugAssert(SameFont(Application->DefaultFont, std::unique_ptr<TFont>(new TFont()).get()));
     Application->DefaultFont->Name = L"Tahoma";
     Application->DefaultFont->Name = L"Tahoma";
     // The default DefaultFont is calculated as -MulDiv(8, ScreenLogPixels, 72)
     // The default DefaultFont is calculated as -MulDiv(8, ScreenLogPixels, 72)
     // But form's font is scaled using DPI, what can resumt in slightly different Height
     // But form's font is scaled using DPI, what can resumt in slightly different Height

+ 1 - 1
source/windows/WinMain.cpp

@@ -572,7 +572,7 @@ void __fastcall UpdateStaticUsage()
   Configuration->Usage->Set(L"ColorDepth", Planes * BitsPixel);
   Configuration->Usage->Set(L"ColorDepth", Planes * BitsPixel);
   Configuration->Usage->Set(L"MonitorCount", Screen->MonitorCount);
   Configuration->Usage->Set(L"MonitorCount", Screen->MonitorCount);
   Configuration->Usage->Set(L"NotUseThemes", !UseThemes());
   Configuration->Usage->Set(L"NotUseThemes", !UseThemes());
-  Configuration->Usage->Set(L"ThemeDefaultFontSize", Application->DefaultFont->Size);
+  Configuration->Usage->Set(L"ThemeDefaultFontSize", std::unique_ptr<TFont>(new TFont())->Size);
   Configuration->Usage->Set(L"ThemeIconFontSize", Screen->IconFont->Size);
   Configuration->Usage->Set(L"ThemeIconFontSize", Screen->IconFont->Size);
 
 
   Configuration->Usage->Set(L"SysColorWindow", ColorToRGBStr(clWindow));
   Configuration->Usage->Set(L"SysColorWindow", ColorToRGBStr(clWindow));