Author: gedmurphy Date: Fri Jul 27 17:47:28 2007 New Revision: 27931
URL: http://svn.reactos.org/svn/reactos?rev=27931&view=rev Log: set the text in the mem and cpu graphs to use the default GUI font. This cleans up the appearance
Modified: trunk/reactos/base/applications/taskmgr/graph.c trunk/reactos/base/applications/taskmgr/lang/en-US.rc
Modified: trunk/reactos/base/applications/taskmgr/graph.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/g... ============================================================================== --- trunk/reactos/base/applications/taskmgr/graph.c (original) +++ trunk/reactos/base/applications/taskmgr/graph.c Fri Jul 27 17:47:28 2007 @@ -137,6 +137,7 @@ RECT rcText; COLORREF crPrevForeground; TCHAR Text[260]; + HFONT hFont, hOldFont; ULONG CpuUsage; ULONG CpuKernelUsage; int nBars; @@ -173,7 +174,10 @@ rcText = rcClient; InflateRect(&rcText, -2, -2); crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); + hFont = GetStockObject(DEFAULT_GUI_FONT); + hOldFont = SelectObject(hDC, hFont); DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + SelectObject(hDC, hOldFont); SetTextColor(hDC, crPrevForeground);
/* @@ -303,6 +307,7 @@ RECT rcText; COLORREF crPrevForeground; TCHAR Text[260]; + HFONT hFont, hOldFont; ULONGLONG CommitChargeTotal; ULONGLONG CommitChargeLimit; int nBars; @@ -338,7 +343,10 @@ rcText = rcClient; InflateRect(&rcText, -2, -2); crPrevForeground = SetTextColor(hDC, RGB(0, 255, 0)); + hFont = GetStockObject(DEFAULT_GUI_FONT); + hOldFont = SelectObject(hDC, hFont); DrawText(hDC, Text, -1, &rcText, DT_BOTTOM | DT_CENTER | DT_NOPREFIX | DT_SINGLELINE); + SelectObject(hDC, hOldFont); SetTextColor(hDC, crPrevForeground);
/*
Modified: trunk/reactos/base/applications/taskmgr/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/l... ============================================================================== --- trunk/reactos/base/applications/taskmgr/lang/en-US.rc (original) +++ trunk/reactos/base/applications/taskmgr/lang/en-US.rc Fri Jul 27 17:47:28 2007 @@ -179,7 +179,7 @@ STYLE DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME -CAPTION "Task Manager" +CAPTION "ReactOS Task Manager" MENU IDR_TASKMANAGER FONT 8, "MS Shell Dlg" BEGIN