ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

taskmgr: Use system font instead of special bitmap font. 

Signed-off-by: Vijay Kiran Kamuju <infyquest@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Müller 2019-04-01 13:38:28 +02:00 committed by Alexandre Julliard
parent 7bca617c6a
commit 5cd7f63f72
5 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
programs/taskmgr/font.bmp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 646 B

14
programs/taskmgr/graph.c
View File

@ -43,6 +43,7 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd)
RECT rcClient; RECT rcClient;
RECT rcBarLeft; RECT rcBarLeft;
RECT rcBarRight; RECT rcBarRight;
RECT rcText;
WCHAR Text[256]; WCHAR Text[256];
ULONG CpuUsage; ULONG CpuUsage;
ULONG CpuKernelUsage; ULONG CpuKernelUsage;
@ -96,7 +97,11 @@ static void Graph_DrawCpuUsageGraph(HDC hDC, HWND hWnd)
* Draw the font text onto the graph * Draw the font text onto the graph
* The bottom 20 pixels are reserved for the text * The bottom 20 pixels are reserved for the text
*/ */
Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - 32) / 2, rcClient.bottom - 11 - 5); CopyRect(&rcText, &rcClient);
rcText.top = rcText.bottom - 19;
SetTextColor(hDC, BRIGHT_GREEN);
DrawTextW(hDC, Text, -1, &rcText, DT_CENTER);
/* /*
* Now we have to draw the graph * Now we have to draw the graph
@ -223,6 +228,7 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd)
RECT rcClient; RECT rcClient;
RECT rcBarLeft; RECT rcBarLeft;
RECT rcBarRight; RECT rcBarRight;
RECT rcText;
WCHAR Text[256]; WCHAR Text[256];
ULONGLONG CommitChargeTotal; ULONGLONG CommitChargeTotal;
ULONGLONG CommitChargeLimit; ULONGLONG CommitChargeLimit;
@ -257,7 +263,11 @@ static void Graph_DrawMemUsageGraph(HDC hDC, HWND hWnd)
* Draw the font text onto the graph * Draw the font text onto the graph
* The bottom 20 pixels are reserved for the text * The bottom 20 pixels are reserved for the text
*/ */
Font_DrawText(hDC, Text, ((rcClient.right - rcClient.left) - (lstrlenW(Text) * 8)) / 2, rcClient.bottom - 11 - 5); CopyRect(&rcText, &rcClient);
rcText.top = rcText.bottom - 19;
SetTextColor(hDC, BRIGHT_GREEN);
DrawTextW(hDC, Text, -1, &rcText, DT_CENTER);
/* /*
* Now we have to draw the graph * Now we have to draw the graph

1
programs/taskmgr/resource.h
View File

@ -35,7 +35,6 @@
#define IDR_PROCESS_PAGE_CONTEXT 144 #define IDR_PROCESS_PAGE_CONTEXT 144
#define IDB_TRAYMASK 150 #define IDB_TRAYMASK 150
#define IDB_TRAYICON 153 #define IDB_TRAYICON 153
#define IDB_FONT 154
#define IDD_DEBUG_CHANNELS_DIALOG 155 #define IDD_DEBUG_CHANNELS_DIALOG 155
#define IDC_DEBUG_CHANNELS_LIST 156 #define IDC_DEBUG_CHANNELS_LIST 156

29
programs/taskmgr/taskmgr.c
View File

@ -76,35 +76,6 @@ static void Draw3dRect(HDC hDC, int x, int y, int cx, int cy, COLORREF clrTopLef
FillSolidRect2(hDC, x, y + cy, cx, -1, clrBottomRight); FillSolidRect2(hDC, x, y + cy, cx, -1, clrBottomRight);
} }
void Font_DrawText(HDC hDC, LPWSTR lpwszText, int x, int y)
{
HDC hFontDC;
HBITMAP hFontBitmap;
HBITMAP hOldBitmap;
int i;
hFontDC = CreateCompatibleDC(hDC);
hFontBitmap = LoadBitmapW(hInst, MAKEINTRESOURCEW(IDB_FONT));
hOldBitmap = SelectObject(hFontDC, hFontBitmap);
for (i = 0; lpwszText[i]; i++) {
if ((lpwszText[i] >= '0') && (lpwszText[i] <= '9')) {
BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, (lpwszText[i] - '0') * 8, 0, SRCCOPY);
}
else if (lpwszText[i] == 'K')
{
BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 80, 0, SRCCOPY);
}
else if (lpwszText[i] == '%')
{
BitBlt(hDC, x + (i * 8), y, 8, 11, hFontDC, 88, 0, SRCCOPY);
}
}
SelectObject(hFontDC, hOldBitmap);
DeleteObject(hFontBitmap);
DeleteDC(hFontDC);
}
static BOOL OnCreate(HWND hWnd) static BOOL OnCreate(HWND hWnd)
{ {
HMENU hMenu; HMENU hMenu;

3
programs/taskmgr/taskmgr.rc
View File

@ -609,6 +609,3 @@ IDB_TRAYMASK BITMAP traymask.bmp
/* @makedep: trayicon.bmp */ /* @makedep: trayicon.bmp */
IDB_TRAYICON BITMAP trayicon.bmp IDB_TRAYICON BITMAP trayicon.bmp
/* @makedep: font.bmp */
IDB_FONT BITMAP font.bmp