xw-devtool-cli 1.0.32 → 1.0.34

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xw-devtool-cli",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "type": "module",
   "description": "基于node的开发者助手cli",
   "main": "index.js",

package/src/commands/pixelDistance.js

@@ -25,6 +25,7 @@ public class DistanceForm : Form {
     private bool p1Set = false;
     private bool p2Set = false;
     private Bitmap screenCapture;
+    private Timer t;
 
     public DistanceForm() {
         this.FormBorderStyle = FormBorderStyle.None;
@@ -47,6 +48,11 @@ public class DistanceForm : Form {
             g.CopyFromScreen(totalBounds.Location, Point.Empty, totalBounds.Size);
         }
         this.BackgroundImage = screenCapture;
+
+        t = new Timer();
+        t.Interval = 33;
+        t.Tick += (s, e) => { this.Invalidate(); };
+        t.Start();
     }
 
     private Point GetSnappedPoint(Point current) {
@@ -95,9 +101,7 @@ public class DistanceForm : Form {
     }
 
     protected override void OnMouseMove(MouseEventArgs e) {
-        if (p1Set && !p2Set) {
-            this.Invalidate();
-        }
+        this.Invalidate();
     }
 
     protected override void OnPaint(PaintEventArgs e) {
@@ -105,10 +109,18 @@ public class DistanceForm : Form {
         g.SmoothingMode = System.Drawing.Drawing2D.SmoothingMode.AntiAlias;
 
         Pen pen = new Pen(Color.Red, 2);
+        Pen crossPen = new Pen(Color.Red, 1);
         Brush brush = Brushes.Red;
         Font font = new Font("Segoe UI", 12, FontStyle.Bold);
         Brush textBg = new SolidBrush(Color.FromArgb(180, 0, 0, 0));
 
+        Point cp = this.PointToClient(Cursor.Position);
+        int gap = 24;
+        g.DrawLine(crossPen, 0, cp.Y, Math.Max(0, cp.X - gap), cp.Y);
+        g.DrawLine(crossPen, Math.Min(this.ClientSize.Width, cp.X + gap), cp.Y, this.ClientSize.Width, cp.Y);
+        g.DrawLine(crossPen, cp.X, 0, cp.X, Math.Max(0, cp.Y - gap));
+        g.DrawLine(crossPen, cp.X, Math.Min(this.ClientSize.Height, cp.Y + gap), cp.X, this.ClientSize.Height);
+
         if (p1Set) {
             Point target = p2Set ? p2 : GetSnappedPoint(this.PointToClient(Cursor.Position));
             
@@ -123,14 +135,10 @@ public class DistanceForm : Form {
             double dist = Math.Sqrt(Math.Pow(target.X - p1.X, 2) + Math.Pow(target.Y - p1.Y, 2));
             string text = String.Format("{0:F2} px", dist);
             
-            // Draw text at midpoint
-            Point mid = new Point((p1.X + target.X) / 2, (p1.Y + target.Y) / 2);
             SizeF size = g.MeasureString(text, font);
-            
-            // Ensure text doesn't go off screen
-            float txtX = mid.X + 10;
-            float txtY = mid.Y + 10;
-            
+            float pad = 16;
+            float txtX = this.ClientSize.Width - (float)size.Width - pad;
+            float txtY = this.ClientSize.Height - (float)size.Height - pad;
             g.FillRectangle(textBg, txtX - 2, txtY - 2, size.Width + 4, size.Height + 4);
             g.DrawString(text, font, Brushes.White, txtX, txtY);