Update main window tab control font, Allow changing main window tab font

Author: dmex

ProcessHacker/main.c

@@ -551,9 +551,7 @@ VOID PhInitializeFont(
     )
 {
     NONCLIENTMETRICS metrics = { sizeof(metrics) };
-
-    if (PhApplicationFont)
-        DeleteObject(PhApplicationFont);
+    HFONT oldFont = PhApplicationFont;
 
     if (
         !(PhApplicationFont = PhCreateFont(L"Microsoft Sans Serif", 8, FW_NORMAL)) &&
@@ -565,6 +563,8 @@ VOID PhInitializeFont(
         else
             PhApplicationFont = NULL;
     }
+
+    if (oldFont) DeleteFont(oldFont);
 }
 
 BOOLEAN PhInitializeDirectoryPolicy(

ProcessHacker/mainwnd.c

@@ -577,10 +577,10 @@ VOID PhMwpOnSettingChange(
 {
     PhInitializeFont();
 
-    if (TabControlHandle)
-    {
-        SetWindowFont(TabControlHandle, PhApplicationFont, TRUE);
-    }
+    //if (TabControlHandle)
+    //{
+    //    SetWindowFont(TabControlHandle, PhApplicationFont, TRUE);
+    //}
 }
 
 static NTSTATUS PhpOpenServiceControlManager(
@@ -3564,6 +3564,7 @@ VOID PhMwpInvokeUpdateWindowFont(
     _In_ PVOID Parameter
     )
 {
+    HFONT oldFont = PhTreeWindowFont;
     PPH_STRING fontHexString;
     LOGFONT font;
 
@@ -3576,19 +3577,17 @@ VOID PhMwpInvokeUpdateWindowFont(
     {
         HFONT newFont;
 
-        newFont = CreateFontIndirect(&font);
-
-        if (newFont)
-        {
-            if (PhTreeWindowFont)
-                DeleteFont(PhTreeWindowFont);
+        if (newFont = CreateFontIndirect(&font))
+        {      
             PhTreeWindowFont = newFont;
-
-            PhMwpNotifyAllPages(MainTabPageFontChanged, newFont, NULL);
+            PhMwpNotifyAllPages(MainTabPageFontChanged, newFont, NULL);           
         }
     }
 
+    SetWindowFont(TabControlHandle, PhTreeWindowFont, TRUE);
     SendMessage(PhMainWndHandle, WM_PH_UPDATE_FONT, 0, 0);
+
+    if (oldFont) DeleteFont(oldFont);
 }
 
 VOID PhMwpInvokePrepareEarlyExit(