fix: pixInof on top of cutMask

Author: xland

res/res.rc

@@ -8,8 +8,8 @@ IDI_LOGO ICON "logo.ico"
 IDR_ICON_FONT ICON_FONT "icon.ttf"
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 2,1,9,0
-PRODUCTVERSION 2,1,9,0
+FILEVERSION 2,1,10,0
+PRODUCTVERSION 2,1,10,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -26,12 +26,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "GitHub xland"
             VALUE "FileDescription", "ScreenCapture"
-            VALUE "FileVersion", "2.1.9.0"
+            VALUE "FileVersion", "2.1.10.0"
             VALUE "InternalName", "ScreenCapture.exe"
             VALUE "LegalCopyright", "Copyright (C) LiuXiaolun 2023-2024"
             VALUE "OriginalFilename", "ScreenCapture.exe"
             VALUE "ProductName", "ScreenCapture"
-            VALUE "ProductVersion", "2.1.9.0"
+            VALUE "ProductVersion", "2.1.10.0"
         END
     END
     BLOCK "VarFileInfo"

src/PixelInfo.cpp

@@ -1,4 +1,4 @@
-#include "PixelInfo.h"
+#include "PixelInfo.h"
 #include "App.h"
 #include "WindowBase.h"
 #include "include/core/SkRegion.h"
@@ -28,24 +28,36 @@ PixelInfo* PixelInfo::Get()
     return pixelInfo;
 }
 
-bool PixelInfo::OnMouseMove(const int& x, const int& y)
+bool PixelInfo::OnMouseMove(const int& x, const int& y) {
+    auto win = App::GetWin();
+    if (win->IsMouseDown || win->state >= State::mask)
+    {
+        return false;
+    }
+    win->Refresh();
+}
+
+bool PixelInfo::OnPaint(SkCanvas* canvas)
 {
     auto win = App::GetWin();
     if (win->IsMouseDown || win->state >= State::mask)
     {
         return false;
     }
-    float width = 200.0f;
-    float height = 200.0f;
+    float width{ 200.0f },height{ 200.0f },x,y;
+    {
+        POINT mousePos;
+        GetCursorPos(&mousePos);
+        x = (float)mousePos.x;
+        y = (float)mousePos.y;
+    }
     rect.setXYWH(x + 10, y + 10, width, height);    
     if (rect.fLeft + width > win->w) {
         rect.offset(0 - width - 20, 0);
     }
     if (rect.fTop + height > win->h) {
         rect.offset(0, 0 - height - 20);
     }
-    auto canvas = win->surfaceFront->getCanvas();
-    canvas->clear(SK_ColorTRANSPARENT);
     SkPaint paint;
     paint.setColor(SkColorSetARGB(168, 0, 0, 0));
     canvas->drawRect(rect, paint);
@@ -109,8 +121,6 @@ bool PixelInfo::OnMouseMove(const int& x, const int& y)
 
     data = str.data();
     canvas->drawSimpleText(data, str.size()*2, SkTextEncoding::kUTF16, rect.fLeft + 8, rect.fTop + 186, *font, paint);
-
-    win->Refresh();
     return false;
 }
 

src/PixelInfo.h

@@ -1,20 +1,21 @@
-#pragma once
-#include "include/core/SkSurface.h"
-#include "include/core/SkCanvas.h"
-#include "include/core/SkRect.h"
-#include "include/core/SkPoint.h"
-#include "include/core/SkPath.h"
-#include <vector>
-
-class PixelInfo
-{
-public:
-    ~PixelInfo();
-    static void Init();
-    static PixelInfo *Get();
-    bool OnMouseMove(const int &x, const int &y);
-
-private:
-    PixelInfo();
-    SkRect rect;
+#pragma once
+#include "include/core/SkSurface.h"
+#include "include/core/SkCanvas.h"
+#include "include/core/SkRect.h"
+#include "include/core/SkPoint.h"
+#include "include/core/SkPath.h"
+#include <vector>
+
+class PixelInfo
+{
+public:
+    ~PixelInfo();
+    static void Init();
+    static PixelInfo *Get();
+    bool OnPaint(SkCanvas* canvas);
+    bool OnMouseMove(const int& x, const int& y);
+
+private:
+    PixelInfo();
+    SkRect rect;
 };