[PATCH 0/1] MR10593: taskmgr: Fix CPU and Memory usage history graphs

[Steven Don (＠shdon)]

The graphs on the Task Manager "Performance" tab did not update their size correctly when the window was being resized. This resulted to the graphs being clipped to the default (small) size. This patch releases the existing memory DC and bitmaps when the control is resized and allocates new ones.

It also switches from having only 4 horizontal grid lines to having a grid line every 10 rows, making for a grid of squares rather than vertically stretched rectangles.

Before:

![taskmgr-before.png](/uploads/89dd9cbf71f87d94e7cb7b5d369b6f8a/taskmgr-before.png){width=574 height=535}

After:

![taskmgr-after.png](/uploads/c4d63de40ecf3aac9d42dbfde672c7a8/taskmgr-after.png){width=574 height=535}

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/10593

[PATCH 1/1] taskmgr: Fix CPU and Memory usage history graphs

[Steven Don]

From: Steven Don <[e-mail]>

The graphs on the Task Manager "Performance" tab did not update their size
correctly when the window was being resized. This resulted to the graphs being
clipped to the default (small) size. This patch releases the existing memory DC
and bitmaps when the control is resized and allocates new ones.

It also switches from having only 4 horizontal grid lines to having a grid
line every 10 rows, making for a grid of squares rather than vertically
stretched rectangles.
---
 programs/taskmgr/graphctl.c | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/programs/taskmgr/graphctl.c b/programs/taskmgr/graphctl.c
index 214cd75e7ba..9eb5aa89b67 100644
--- a/programs/taskmgr/graphctl.c
+++ b/programs/taskmgr/graphctl.c
@@ -108,6 +108,26 @@ static void GraphCtrl_Init(TGraphCtrl* this)
 
 static void GraphCtrl_Resize(TGraphCtrl* this)
 {
+    /*  clean up existing GDI handles */
+    if (this->m_dcGrid != NULL)
+    {
+        SelectObject(this->m_dcGrid, this->m_bitmapOldGrid);
+        DeleteObject(this->m_bitmapGrid);
+        DeleteDC(this->m_dcGrid);
+        this->m_bitmapOldGrid = NULL;
+        this->m_bitmapGrid = NULL;
+        this->m_dcGrid = NULL;
+    }
+    if (this->m_dcPlot != NULL)
+    {
+        SelectObject(this->m_dcPlot, this->m_bitmapOldPlot);
+        DeleteObject(this->m_bitmapPlot);
+        DeleteDC(this->m_dcPlot);
+        this->m_bitmapOldPlot = NULL;
+        this->m_bitmapPlot = NULL;
+        this->m_dcPlot = NULL;
+    }
+
     /*  NOTE: Resize automatically gets called during the setup of the control */
     GetClientRect(this->m_hWnd, &this->m_rectClient);
 
@@ -143,7 +163,6 @@ static void GraphCtrl_InvalidateCtrl(TGraphCtrl* this)
     /*  to a bitmap.  The result is then BitBlt'd to the control whenever needed. */
     int i, j;
     int nCharacters;
-    int nTopGridPix, nMidGridPix, nBottomGridPix;
 
     HPEN oldPen;
     HPEN solidPen = CreatePen(PS_SOLID, 0, this->m_crGridColor);
@@ -196,15 +215,13 @@ static void GraphCtrl_InvalidateCtrl(TGraphCtrl* this)
      *  use SetPixel instead of a dotted pen - this allows for a 
      *  finer dotted line and a more "technical" look
      */
-    nMidGridPix    = (this->m_rectPlot.top + this->m_rectPlot.bottom)/2;
-    nTopGridPix    = nMidGridPix - this->m_nPlotHeight/4;
-    nBottomGridPix = nMidGridPix + this->m_nPlotHeight/4;
 
     for (i=this->m_rectPlot.left; i<this->m_rectPlot.right; i+=2) 
     {
-        SetPixel(this->m_dcGrid, i, nTopGridPix,    this->m_crGridColor);
-        SetPixel(this->m_dcGrid, i, nMidGridPix,    this->m_crGridColor);
-        SetPixel(this->m_dcGrid, i, nBottomGridPix, this->m_crGridColor);
+        for (j=this->m_rectPlot.bottom; j>=this->m_rectPlot.top; j-=10)
+        {
+            SetPixel(this->m_dcGrid, i, j, this->m_crGridColor);
+        }
     }
 
     for (i=this->m_rectPlot.left; i<this->m_rectPlot.right; i+=10)
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/10593