Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-05 05:01:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fixes to performance page resizing and font.bmp updated.

Browse source 
svn path=/trunk/; revision=3169
This commit is contained in:
Robert Dickenson 2002-07-02 15:43:04 +00:00
parent 4b42b078ed
commit bdbc30455a
4 changed files with 51 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
rosapps/taskmgr/GraphCtrl.cpp
View file

@ -649,6 +649,24 @@ LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
case WM_SYSKEYDOWN: case WM_SYSKEYDOWN:
case WM_SYSKEYUP: case WM_SYSKEYUP:
return 0; return 0;
case WM_NCCALCSIZE:
return 0;
case WM_SIZE:
// pGraphCtrl = TGraphCtrl::LookupGraphCtrl(hWnd);
// if (pGraphCtrl) pGraphCtrl->Resize(wParam, HIWORD(lParam), LOWORD(lParam));
if (hWnd == hPerformancePageMemUsageHistoryGraph) {
PerformancePageMemUsageHistoryGraph.Resize();
PerformancePageMemUsageHistoryGraph.InvalidateCtrl();
}
if (hWnd == hPerformancePageCpuUsageHistoryGraph) {
PerformancePageCpuUsageHistoryGraph.Resize();
PerformancePageCpuUsageHistoryGraph.InvalidateCtrl();
}
return 0;
break;
case WM_PAINT: case WM_PAINT:
hdc = BeginPaint(hWnd, &ps); hdc = BeginPaint(hWnd, &ps);
// pGraphCtrl = TGraphCtrl::LookupGraphCtrl(hWnd); // pGraphCtrl = TGraphCtrl::LookupGraphCtrl(hWnd);
@ -662,31 +680,6 @@ LRESULT CALLBACK GraphCtrl_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARA
} }
EndPaint(hWnd, &ps); EndPaint(hWnd, &ps);
return 0; return 0;
/*
WindowId = GetWindowLong(hWnd, GWL_ID);
switch (WindowId) {
case IDC_CPU_USAGE_GRAPH:
Graph_DrawCpuUsageGraph(hdc, hWnd);
break;
case IDC_MEM_USAGE_GRAPH:
Graph_DrawMemUsageGraph(hdc, hWnd);
break;
case IDC_MEM_USAGE_HISTORY_GRAPH:
Graph_DrawMemUsageHistoryGraph(hdc, hWnd);
break;
}
*/
case WM_SIZE:
// pGraphCtrl = TGraphCtrl::LookupGraphCtrl(hWnd);
// if (pGraphCtrl) pGraphCtrl->Resize(wParam, HIWORD(lParam), LOWORD(lParam));
if (hWnd == hPerformancePageMemUsageHistoryGraph) {
PerformancePageMemUsageHistoryGraph.Resize();
}
if (hWnd == hPerformancePageCpuUsageHistoryGraph) {
PerformancePageCpuUsageHistoryGraph.Resize();
}
return 0;
} }
// //

74
rosapps/taskmgr/PerformancePage.cpp
View file

@ -89,6 +89,7 @@ void AdjustFrameSize(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference,
{ {
RECT rc; RECT rc;
int cx, cy, sx, sy; int cx, cy, sx, sy;
GetClientRect(hCntrl, &rc); GetClientRect(hCntrl, &rc);
MapWindowPoints(hCntrl, hDlg, (LPPOINT)(&rc), (sizeof(RECT)/sizeof(POINT))); MapWindowPoints(hCntrl, hDlg, (LPPOINT)(&rc), (sizeof(RECT)/sizeof(POINT)));
if (pos) { if (pos) {
@ -102,11 +103,11 @@ void AdjustFrameSize(HWND hCntrl, HWND hDlg, int nXDifference, int nYDifference,
cy += nYDifference / 2; cy += nYDifference / 2;
break; break;
case 3: case 3:
sx += nXDifference / 2; sx += nXDifference;
break; break;
case 4: case 4:
cy += nYDifference / 2; cy += nYDifference / 2;
sx += nXDifference / 2; sx += nXDifference;
break; break;
} }
sy = rc.bottom - rc.top + nYDifference / 2; sy = rc.bottom - rc.top + nYDifference / 2;
@ -214,13 +215,8 @@ LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam,
// //
OldGraphWndProc = SetWindowLong(hPerformancePageCpuUsageGraph, GWL_WNDPROC, (LONG)Graph_WndProc); OldGraphWndProc = SetWindowLong(hPerformancePageCpuUsageGraph, GWL_WNDPROC, (LONG)Graph_WndProc);
SetWindowLong(hPerformancePageMemUsageGraph, GWL_WNDPROC, (LONG)Graph_WndProc); SetWindowLong(hPerformancePageMemUsageGraph, GWL_WNDPROC, (LONG)Graph_WndProc);
// SetWindowLong(hPerformancePageMemUsageHistoryGraph, GWL_WNDPROC, (LONG)Graph_WndProc);
// OldGraphCtrlWndProc = SetWindowLong(hPerformancePageCpuUsageGraph, GWL_WNDPROC, (LONG)GraphCtrl_WndProc);
// SetWindowLong(hPerformancePageMemUsageGraph, GWL_WNDPROC, (LONG)GraphCtrl_WndProc);
OldGraphCtrlWndProc = SetWindowLong(hPerformancePageMemUsageHistoryGraph, GWL_WNDPROC, (LONG)GraphCtrl_WndProc); OldGraphCtrlWndProc = SetWindowLong(hPerformancePageMemUsageHistoryGraph, GWL_WNDPROC, (LONG)GraphCtrl_WndProc);
SetWindowLong(hPerformancePageCpuUsageHistoryGraph, GWL_WNDPROC, (LONG)GraphCtrl_WndProc); SetWindowLong(hPerformancePageCpuUsageHistoryGraph, GWL_WNDPROC, (LONG)GraphCtrl_WndProc);
return TRUE; return TRUE;
case WM_COMMAND: case WM_COMMAND:
@ -228,23 +224,22 @@ LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam,
#if 0 #if 0
case WM_NCPAINT: case WM_NCPAINT:
hdc = GetDC(hDlg); hdc = GetDC(hDlg);
//GetClientRect(hDlg, &rc); GetClientRect(hDlg, &rc);
//Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT)); Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT));
ReleaseDC(hDlg, hdc); ReleaseDC(hDlg, hdc);
break; break;
case WM_PAINT: case WM_PAINT:
hdc = BeginPaint(hDlg, &ps); hdc = BeginPaint(hDlg, &ps);
GetClientRect(hDlg, &rc);
//GetClientRect(hDlg, &rc); Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT));
//Draw3dRect(hdc, rc.left, rc.top, rc.right, rc.top + 2, GetSysColor(COLOR_3DSHADOW), GetSysColor(COLOR_3DHILIGHT));
EndPaint(hDlg, &ps); EndPaint(hDlg, &ps);
break; break;
#endif #endif
case WM_SIZE: case WM_SIZE:
int cx, cy; int cx, cy;
if (wParam == SIZE_MINIMIZED) if (wParam == SIZE_MINIMIZED)
return 0; return 0;
cx = LOWORD(lParam); cx = LOWORD(lParam);
@ -253,8 +248,6 @@ LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam,
nYDifference = cy - nPerformancePageHeight; nYDifference = cy - nPerformancePageHeight;
nPerformancePageWidth = cx; nPerformancePageWidth = cx;
nPerformancePageHeight = cy; nPerformancePageHeight = cy;
// SetWindowPos(hPerformancePageMemUsageHistoryGraph, NULL, 0, 0, cx, cy, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER);
// SetWindowPos(hPerformancePageCpuUsageHistoryGraph, NULL, 0, 0, cx, cy, SWP_NOACTIVATE|SWP_NOOWNERZORDER|SWP_NOSIZE|SWP_NOZORDER);
// Reposition the performance page's controls // Reposition the performance page's controls
AdjustFrameSize(hPerformancePageTotalsFrame, hDlg, 0, nYDifference, 0); AdjustFrameSize(hPerformancePageTotalsFrame, hDlg, 0, nYDifference, 0);
@ -287,42 +280,39 @@ LRESULT CALLBACK PerformancePageWndProc(HWND hDlg, UINT message, WPARAM wParam,
AdjustControlPostion(hPerformancePageTotalsProcessCountEdit, hDlg, 0, nYDifference); AdjustControlPostion(hPerformancePageTotalsProcessCountEdit, hDlg, 0, nYDifference);
AdjustControlPostion(hPerformancePageTotalsThreadCountEdit, hDlg, 0, nYDifference); AdjustControlPostion(hPerformancePageTotalsThreadCountEdit, hDlg, 0, nYDifference);
static int lastX, lastY; static int lastX, lastY;
nXDifference += lastX; nXDifference += lastX;
nYDifference += lastY; nYDifference += lastY;
lastX = lastY = 0; lastX = lastY = 0;
if (nXDifference % 2) { if (nXDifference % 2) {
if (nXDifference > 0) { if (nXDifference > 0) {
nXDifference--; nXDifference--;
lastX++; lastX++;
} else { } else {
nXDifference++; nXDifference++;
lastX--; lastX--;
} }
} }
if (nYDifference % 2) { if (nYDifference % 2) {
if (nYDifference > 0) { if (nYDifference > 0) {
nYDifference--; nYDifference--;
lastY++; lastY++;
} else { } else {
nYDifference++; nYDifference++;
lastY--; lastY--;
} }
} }
AdjustFrameSize(hPerformancePageCpuUsageFrame, hDlg, nXDifference, nYDifference, 1); AdjustFrameSize(hPerformancePageCpuUsageFrame, hDlg, nXDifference, nYDifference, 1);
AdjustFrameSize(hPerformancePageMemUsageFrame, hDlg, nXDifference, nYDifference, 2); AdjustFrameSize(hPerformancePageMemUsageFrame, hDlg, nXDifference, nYDifference, 2);
AdjustFrameSize(hPerformancePageCpuUsageHistoryFrame, hDlg, nXDifference, nYDifference, 3); AdjustFrameSize(hPerformancePageCpuUsageHistoryFrame, hDlg, nXDifference, nYDifference, 3);
AdjustFrameSize(hPerformancePageMemUsageHistoryFrame, hDlg, nXDifference, nYDifference, 4); AdjustFrameSize(hPerformancePageMemUsageHistoryFrame, hDlg, nXDifference, nYDifference, 4);
/*
AdjustFrameSize(hPerformancePageCpuUsageGraph, hDlg, nXDifference, nYDifference, 1); AdjustFrameSize(hPerformancePageCpuUsageGraph, hDlg, nXDifference, nYDifference, 1);
AdjustFrameSize(hPerformancePageMemUsageGraph, hDlg, nXDifference, nYDifference, 2); AdjustFrameSize(hPerformancePageMemUsageGraph, hDlg, nXDifference, nYDifference, 2);
AdjustFrameSize(hPerformancePageMemUsageHistoryGraph, hDlg, nXDifference, nYDifference, 3); AdjustFrameSize(hPerformancePageCpuUsageHistoryGraph, hDlg, nXDifference, nYDifference, 3);
AdjustFrameSize(hPerformancePageCpuUsageHistoryGraph, hDlg, nXDifference, nYDifference, 4); AdjustFrameSize(hPerformancePageMemUsageHistoryGraph, hDlg, nXDifference, nYDifference, 4);
*/
break; break;
} }
return 0; return 0;
} }

BIN
rosapps/taskmgr/font.bmp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 646 B

After

Width:  |  Height:  |  Size: 646 B

1
rosapps/taskmgr/graph.cpp
View file

@ -111,6 +111,7 @@ LRESULT CALLBACK Graph_WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lP
case WM_SYSKEYDOWN: case WM_SYSKEYDOWN:
case WM_SYSKEYUP: case WM_SYSKEYUP:
case WM_NCCALCSIZE:
return 0; return 0;
case WM_PAINT: case WM_PAINT: