Changeset 1338

Timestamp:

05/06/25 23:03:14 (2 days ago)

Author:

Maciej Komosinski

Message:

NeuroProbe? signal enforcement handle now scales with font size

File:

• cpp/frams/canvas/neurodiagram.cpp (modified) (5 diffs)

cpp/frams/canvas/neurodiagram.cpp

@@ -484 +484 @@
         {
                 clientbordersset = 1;
-                setClientBorder(0, 1, 16, textHeight() + 2); // don't use textheight outside paint/mouse events
+                setClientBorder(0, 1, textHeight(), textHeight() + 2); // don't use textheight outside paint/mouse events
         }
         int hold = link->n->flags & Neuro::HoldState;
@@ -531 +531 @@
         if (chsel >= 0)
         {
+                int th = textHeight();
                 if (ni) state = (float)ni->getState(chsel);
-                yline -= textHeight();
+                yline -= th;
                 int y = mapClientY(neurochart.mapData(state));
-                int x = size.x - 15 - 1;
+                int x = size.x - th - 1;
                 drawLine(1, yline, size.x - 2, yline);
                 if (hold)
                 {
                         sprintf(t, "hold: %1.3g", state);
-                        fillRect(x, y - 1 - 5, 15, 3 + 5 + 5);
+                        fillRect(x, y - 1 - th/2, th, 3 + th);
                         setColor(255, 0, 0);
-                        fillRect(x + 2, y - 1, 15 - 2 - 2, 3);
+                        fillRect(x + 1 + th/8, y - 1 - th/8, th - th/4 - 2, th/4);
                 }
                 else
                 {
                         sprintf(t, "signal: %1.3g", state);
-                        fillRect(x, y - 1, 15, 3);
-                }
-                drawAlignedText(size.x - textHeight(), yline, 1, t);
+                        fillRect(x, y - 1 - th/8, th, th/4 + 1);
+                }
+                drawAlignedText(size.x - th, yline, 1, t);
         }
 
@@ -625 +626 @@
         if (b & LeftButton)
         {
-                if (x > size.x - 16)
+                int th = textHeight();
+                if (x > size.x - th)
                 {
                         link->n->flags |= Neuro::HoldState;
@@ -633 +635 @@
                         return LeftButton;
                 }
-                else if (y > size.y - 16)
+                else if (y > size.y - th)
                 {
                         link->n->flags ^= Neuro::HoldState;
@@ -646 +648 @@
 SString NeuroProbe::hint(int x, int y)
 {
-        if ((chsel >= 0) && (x < size.x - 16) && (y > size.y - 16))
+        int th = textHeight();
+        if ((chsel >= 0) && (x < size.x - th) && (y > size.y - th))
                 return SString((link->n->flags & Neuro::HoldState) ? "Click to release" : "Click to hold");
         else if (insideChSelector(x, y))