ToolStatus: Fix statusbar height when using custom fonts

Author: dmex

plugins/ToolStatus/main.c

@@ -507,7 +507,7 @@ VOID NTAPI LayoutPaddingCallback(
         // Adjust the PH client area and exclude the StatusBar width.
         layoutPadding->Padding.bottom += statusBarRect.bottom;
 
-        InvalidateRect(StatusBarHandle, NULL, TRUE);
+        //InvalidateRect(StatusBarHandle, NULL, TRUE);
     }
 }
 
@@ -1275,31 +1275,33 @@ LRESULT CALLBACK MainWndSubclassProc(
         break;
     case WM_PH_UPDATE_FONT:
         {
-            HFONT newFont;
-
             // Let Process Hacker perform the default processing.
             CallWindowProc(MainWindowHookProc, hWnd, uMsg, wParam, lParam);
 
-            if (newFont = ProcessHacker_GetFont())
-            {
-                if (ToolbarWindowFont) DeleteFont(ToolbarWindowFont);
-                ToolbarWindowFont = newFont;
+            ToolbarWindowFont = ProcessHacker_GetFont();
+            SetWindowFont(ToolBarHandle, ToolbarWindowFont, TRUE);
+            SetWindowFont(StatusBarHandle, ToolbarWindowFont, TRUE);
 
-                SetWindowFont(ToolBarHandle, ToolbarWindowFont, TRUE);
-                SetWindowFont(StatusBarHandle, ToolbarWindowFont, TRUE);
+            {
+                //ULONG toolbarButtonSize = (ULONG)SendMessage(ToolBarHandle, TB_GETBUTTONSIZE, 0, 0);
+                LONG toolbarButtonHeight = ToolStatusGetWindowFontSize(ToolBarHandle, ToolbarWindowFont);
+                toolbarButtonHeight = __max(22, toolbarButtonHeight); // 22/default toolbar button height
 
-                {
-                    //ULONG toolbarButtonSize = (ULONG)SendMessage(ToolBarHandle, TB_GETBUTTONSIZE, 0, 0);
-                    LONG toolbarButtonHeight = ToolbarGetFontSize();
-                    toolbarButtonHeight = __max(22, toolbarButtonHeight); // 22/default toolbar button height
+                RebarAdjustBandHeightLayout(toolbarButtonHeight);
+                SendMessage(ToolBarHandle, TB_SETBUTTONSIZE, 0, MAKELPARAM(0, toolbarButtonHeight));
+            }
 
-                    RebarAdjustBandHeightLayout(toolbarButtonHeight);
-                    SendMessage(ToolBarHandle, TB_SETBUTTONSIZE, 0, MAKELPARAM(0, toolbarButtonHeight));
-                }
+            {
+                LONG statusbarButtonHeight = ToolStatusGetWindowFontSize(StatusBarHandle, ToolbarWindowFont);
+                statusbarButtonHeight = __max(23, statusbarButtonHeight); // 23/default statusbar height
 
-                ToolbarLoadSettings();
+                SendMessage(StatusBarHandle, SB_SETMINHEIGHT, statusbarButtonHeight, 0);
+                //SendMessage(StatusBarHandle, WM_SIZE, 0, 0); // redraw
+                StatusBarUpdate(TRUE);
             }
 
+            ToolbarLoadSettings();
+
             goto DefaultWndProc;
         }
         break;

plugins/ToolStatus/toolbar.c

@@ -108,19 +108,13 @@ VOID RebarLoadSettings(
     VOID
     )
 {
+    ToolbarWindowFont = ProcessHacker_GetFont();
+
     if (ToolStatusConfig.ToolBarEnabled && !ToolBarImageList)
     {
         ToolBarImageSize.cx = GetSystemMetrics(SM_CXSMICON);
         ToolBarImageSize.cy = GetSystemMetrics(SM_CYSMICON);
         ToolBarImageList = PhImageListCreate(ToolBarImageSize.cx, ToolBarImageSize.cy, ILC_MASK | ILC_COLOR32, 0, 0);
-
-        HFONT newFont;
-
-        if (newFont = ProcessHacker_GetFont())
-        {
-            if (ToolbarWindowFont) DeleteFont(ToolbarWindowFont);
-            ToolbarWindowFont = newFont;
-        }
     }
 
     if (ToolStatusConfig.ToolBarEnabled && !RebarHandle)
@@ -169,7 +163,7 @@ VOID RebarLoadSettings(
         // determine the font size and adjust the toolbar height.
         {
             ULONG toolbarButtonSize = (ULONG)SendMessage(ToolBarHandle, TB_GETBUTTONSIZE, 0, 0);
-            LONG toolbarButtonHeight = ToolbarGetFontSize();
+            LONG toolbarButtonHeight = ToolStatusGetWindowFontSize(ToolBarHandle, ToolbarWindowFont);
 
             RebarBandInsert(REBAR_BAND_ID_TOOLBAR, ToolBarHandle, LOWORD(toolbarButtonSize), __max(HIWORD(toolbarButtonSize), toolbarButtonHeight));
 
@@ -225,6 +219,19 @@ VOID RebarLoadSettings(
         // Configure the statusbar font.
         SetWindowFont(StatusBarHandle, ToolbarWindowFont, FALSE);
 
+        // Determine the font size and adjust the statusbar height.
+        {
+            LONG height = ToolStatusGetWindowFontSize(StatusBarHandle, ToolbarWindowFont);
+            RECT statusBarRect;
+
+            GetClientRect(StatusBarHandle, &statusBarRect);
+
+            if (statusBarRect.bottom < height)
+            {
+                SendMessage(StatusBarHandle, SB_SETMINHEIGHT, height, 0);
+            }
+        }
+
         if (StatusBarHandle && PhGetIntegerSetting(L"EnableThemeSupport"))
         {
             PhInitializeWindowThemeStatusBar(StatusBarHandle);
@@ -458,31 +465,6 @@ PWSTR ToolbarGetText(
     return L"ERROR";
 }
 
-LONG ToolbarGetFontSize(
-    VOID
-    )
-{
-    LONG height = 0;
-    TEXTMETRIC textMetrics;
-    HDC hdc;
-
-    if (hdc = GetDC(ToolBarHandle))
-    {
-        SelectFont(hdc, ToolbarWindowFont);
-        GetTextMetrics(hdc, &textMetrics);
-
-        // Below we try to match the height as calculated by the toolbar, even if it
-        // involves magic numbers. On Vista and above there seems to be extra padding.
-
-        height = textMetrics.tmHeight;
-        ReleaseDC(ToolBarHandle, hdc);
-    }
-
-    height += 5; // Add magic padding
-
-    return height;
-}
-
 HBITMAP ToolbarLoadImageFromIcon(
     _In_ ULONG Width,
     _In_ ULONG Height,
@@ -968,3 +950,29 @@ VOID RebarAdjustBandHeightLayout(
         SendMessage(RebarHandle, RB_SETBANDINFO, index, (LPARAM)&rebarBandInfo);
     }
 }
+
+LONG ToolStatusGetWindowFontSize(
+    _In_ HWND WindowHandle,
+    _In_ HFONT WindowFont
+    )
+{
+    LONG height = 0;
+    TEXTMETRIC textMetrics;
+    HDC hdc;
+
+    if (hdc = GetDC(WindowHandle))
+    {
+        SelectFont(hdc, WindowFont);
+        GetTextMetrics(hdc, &textMetrics);
+
+        // Below we try to match the height as calculated by the toolbar, even if it
+        // involves magic numbers. On Vista and above there seems to be extra padding.
+
+        height = textMetrics.tmHeight;
+        ReleaseDC(WindowHandle, hdc);
+    }
+
+    height += 5; // Add magic padding
+
+    return height;
+}

plugins/ToolStatus/toolstatus.h

@@ -184,10 +184,6 @@ PWSTR ToolbarGetText(
     _In_ INT CommandID
     );
 
-LONG ToolbarGetFontSize(
-    VOID
-    );
-
 HBITMAP ToolbarGetImage(
     _In_ INT CommandID
     );
@@ -212,16 +208,17 @@ VOID RebarAdjustBandHeightLayout(
     _In_ LONG Height
     );
 
+LONG ToolStatusGetWindowFontSize(
+    _In_ HWND WindowHandle,
+    _In_ HFONT WindowFont
+    );
+
 // main.c
 
 HWND GetCurrentTreeNewHandle(
     VOID
     );
 
-HFONT ToolStatusGetTreeWindowFont(
-    VOID
-    );
-
 VOID ShowCustomizeMenu(
     _In_ HWND WindowHandle
     );