#893 fix to address Text sizing and Rotary Switch labels and strokes.

BlueFinBima · BlueFinBima · commit 0dc8c45126c5 · 2025-10-18T14:37:36.000+01:00
diff --git a/Helios/Controls/RotarySwitchRenderer.cs b/Helios/Controls/RotarySwitchRenderer.cs
@@ -67,7 +67,7 @@ protected override void OnRender(System.Windows.Media.DrawingContext drawingCont
                         DrawingContext tempDrawingContext = visual.RenderOpen();
                         tempDrawingContext.DrawDrawing(_lines);
                         tempDrawingContext.Close();
-                        RenderVisual(drawingContext, visual, _imageRect);
+                        RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : _imageRect);
                     }
                 }
                 if (!needsEffect)
@@ -82,10 +82,10 @@ protected override void OnRender(System.Windows.Media.DrawingContext drawingCont
                     DrawingContext tempDrawingContext = visual.RenderOpen();
                     foreach (SwitchPositionLabel label in _labels)
                     {
-                        tempDrawingContext.DrawText(label.Text, new Point(label.Location.X * 1.25, label.Location.Y * 1.25));
+                        tempDrawingContext.DrawText(label.Text, new Point(label.Location.X, label.Location.Y));
                     }
                     tempDrawingContext.Close();
-                    RenderVisual(drawingContext, visual, new Rect(_imageRect.X - (_imageRect.Width * 0.25), _imageRect.Y - (_imageRect.Height * 0.25), _imageRect.Width * 1.5, _imageRect.Height * 1.5));
+                    RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : _imageRect);
                 }
 
                 drawingContext.PushTransform(new RotateTransform(rotarySwitch.KnobRotation, _center.X, _center.Y));
diff --git a/Helios/HeliosVisualRenderer.cs b/Helios/HeliosVisualRenderer.cs
@@ -226,7 +226,7 @@ protected void DrawImage(DrawingContext drawingContext, ImageSource image, Rect
                 DrawingContext tempDrawingContext = visual.RenderOpen();
                 tempDrawingContext.DrawImage(image, rectangle);
                 tempDrawingContext.Close();
-                RenderVisual(drawingContext, visual, rectangle);
+                RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle);
             }
 
         }
@@ -253,7 +253,7 @@ protected void DrawGeometry(DrawingContext drawingContext, Brush brush, Pen pen,
                 DrawingContext tempDrawingContext = visual.RenderOpen();
                 tempDrawingContext.DrawGeometry(brush, pen, path);
                 tempDrawingContext.Close();
-                RenderVisual(drawingContext, visual, rectangle);
+                RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle);
             }
         }
         /// <summary>
@@ -278,7 +278,7 @@ protected void DrawRectangle(DrawingContext drawingContext, Brush brush, Pen pen
                 DrawingContext tempDrawingContext = visual.RenderOpen();
                 tempDrawingContext.DrawRectangle(brush, pen, rectangle);
                 tempDrawingContext.Close();
-                RenderVisual(drawingContext, visual, rectangle);
+                RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle);
             }
         }
         /// <summary>
@@ -303,7 +303,7 @@ protected void DrawRoundedRectangle(DrawingContext drawingContext, Brush brush,
                 DrawingContext tempDrawingContext = visual.RenderOpen();
                 tempDrawingContext.DrawRoundedRectangle(brush, pen, rectangle, radiusX, radiusY);
                 tempDrawingContext.Close();
-                RenderVisual(drawingContext, visual, rectangle);
+                RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle);
             }
         }
         /// <summary>
@@ -331,7 +331,7 @@ protected void DrawText(DrawingContext drawingContext, ITextControl textVisual,
                 DrawingContext tempDrawingContext = visual.RenderOpen();
                 textVisual.TextFormat.RenderText(tempDrawingContext, brush, text, rectangle);
                 tempDrawingContext.Close();
-                RenderVisual(drawingContext, visual, rectangle);
+                RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle);
             }
         }
 #endregion Draw Proxies

Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ protected override void OnRender(System.Windows.Media.DrawingContext drawingCont`
`67`	`67`	`DrawingContext tempDrawingContext = visual.RenderOpen();`
`68`	`68`	`tempDrawingContext.DrawDrawing(_lines);`
`69`	`69`	`tempDrawingContext.Close();`
`70`		`- RenderVisual(drawingContext, visual, _imageRect);`
	`70`	`+ RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : _imageRect);`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`	`if (!needsEffect)`
`@@ -82,10 +82,10 @@ protected override void OnRender(System.Windows.Media.DrawingContext drawingCont`
`82`	`82`	`DrawingContext tempDrawingContext = visual.RenderOpen();`
`83`	`83`	`foreach (SwitchPositionLabel label in _labels)`
`84`	`84`	`{`
`85`		`- tempDrawingContext.DrawText(label.Text, new Point(label.Location.X * 1.25, label.Location.Y * 1.25));`
	`85`	`+ tempDrawingContext.DrawText(label.Text, new Point(label.Location.X, label.Location.Y));`
`86`	`86`	`}`
`87`	`87`	`tempDrawingContext.Close();`
`88`		`- RenderVisual(drawingContext, visual, new Rect(_imageRect.X - (_imageRect.Width * 0.25), _imageRect.Y - (_imageRect.Height * 0.25), _imageRect.Width * 1.5, _imageRect.Height * 1.5));`
	`88`	`+ RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : _imageRect);`
`89`	`89`	`}`
`90`	`90`
`91`	`91`	`drawingContext.PushTransform(new RotateTransform(rotarySwitch.KnobRotation, _center.X, _center.Y));`
Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ protected void DrawImage(DrawingContext drawingContext, ImageSource image, Rect`
`226`	`226`	`DrawingContext tempDrawingContext = visual.RenderOpen();`
`227`	`227`	`tempDrawingContext.DrawImage(image, rectangle);`
`228`	`228`	`tempDrawingContext.Close();`
`229`		`- RenderVisual(drawingContext, visual, rectangle);`
	`229`	`+ RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle);`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`}`
`@@ -253,7 +253,7 @@ protected void DrawGeometry(DrawingContext drawingContext, Brush brush, Pen pen,`
`253`	`253`	`DrawingContext tempDrawingContext = visual.RenderOpen();`
`254`	`254`	`tempDrawingContext.DrawGeometry(brush, pen, path);`
`255`	`255`	`tempDrawingContext.Close();`
`256`		`- RenderVisual(drawingContext, visual, rectangle);`
	`256`	`+ RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle);`
`257`	`257`	`}`
`258`	`258`	`}`
`259`	`259`	`/// <summary>`
`@@ -278,7 +278,7 @@ protected void DrawRectangle(DrawingContext drawingContext, Brush brush, Pen pen`
`278`	`278`	`DrawingContext tempDrawingContext = visual.RenderOpen();`
`279`	`279`	`tempDrawingContext.DrawRectangle(brush, pen, rectangle);`
`280`	`280`	`tempDrawingContext.Close();`
`281`		`- RenderVisual(drawingContext, visual, rectangle);`
	`281`	`+ RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle);`
`282`	`282`	`}`
`283`	`283`	`}`
`284`	`284`	`/// <summary>`
`@@ -303,7 +303,7 @@ protected void DrawRoundedRectangle(DrawingContext drawingContext, Brush brush,`
`303`	`303`	`DrawingContext tempDrawingContext = visual.RenderOpen();`
`304`	`304`	`tempDrawingContext.DrawRoundedRectangle(brush, pen, rectangle, radiusX, radiusY);`
`305`	`305`	`tempDrawingContext.Close();`
`306`		`- RenderVisual(drawingContext, visual, rectangle);`
	`306`	`+ RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle);`
`307`	`307`	`}`
`308`	`308`	`}`
`309`	`309`	`/// <summary>`
`@@ -331,7 +331,7 @@ protected void DrawText(DrawingContext drawingContext, ITextControl textVisual,`
`331`	`331`	`DrawingContext tempDrawingContext = visual.RenderOpen();`
`332`	`332`	`textVisual.TextFormat.RenderText(tempDrawingContext, brush, text, rectangle);`
`333`	`333`	`tempDrawingContext.Close();`
`334`		`- RenderVisual(drawingContext, visual, rectangle);`
	`334`	`+ RenderVisual(drawingContext, visual, !visual.ContentBounds.IsEmpty ? visual.ContentBounds : rectangle);`
`335`	`335`	`}`
`336`	`336`	`}`
`337`	`337`	`#endregion Draw Proxies`