From 0038e2d3e2bcaefea14ff8c3a90c8dfa428033b6 Mon Sep 17 00:00:00 2001
From: fortsnek9348 <fortsnek9348@example.com>
Date: Wed, 20 Apr 2022 17:02:03 +0100
Subject: [PATCH] Fix upgrade tab dot positioning.

---
 .../PartPreviewWindow/MainViewWidget.cs       | 28 +++++++++++--------
 Submodules/agg-sharp                          |  2 +-
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/MatterControlLib/PartPreviewWindow/MainViewWidget.cs b/MatterControlLib/PartPreviewWindow/MainViewWidget.cs
index c0d74d045..935d32953 100644
--- a/MatterControlLib/PartPreviewWindow/MainViewWidget.cs
+++ b/MatterControlLib/PartPreviewWindow/MainViewWidget.cs
@@ -261,20 +261,26 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
 			// Upgrade tab
 			if (!ApplicationController.Instance.IsMatterControlPro())
 			{
-				tabControl.AddTab(
-					tab = new ChromeTab("Upgrade", "Upgrade".Localize(), tabControl, new UpgradeToProTabPage(theme), theme, hasClose: false)
-					{
-						MinimumSize = new Vector2(0, theme.TabButtonHeight),
-						Name = "Upgrade",
-						Padding = new BorderDouble(15, 0),
-					});
+				tab = new ChromeTab("Upgrade", "Upgrade".Localize(), tabControl, new UpgradeToProTabPage(theme), theme, hasClose: false)
+				{
+					MinimumSize = new Vector2(0, theme.TabButtonHeight),
+					Name = "Upgrade",
+					Padding = new BorderDouble(15, 0),
+				};
+				tabControl.AddTab(tab);
+
+				ChromeTab upgradeTab = tab;
 
 				tab.AfterDraw += (s, e) =>
 				{
-					var textWidget = tab.Descendants<TextWidget>().FirstOrDefault();
-					e.Graphics2D.Circle(Math.Max(textWidget.Width, tab.LocalBounds.Right - 25 * DeviceScale),
-						tab.LocalBounds.Bottom + tab.Height / 2 - 1 * DeviceScale,
-						5 * DeviceScale,
+					var textWidget = upgradeTab.Descendants<TextWidget>().FirstOrDefault();
+
+					var localLabelEndPosition = textWidget.TransformToScreenSpace(textWidget.Printer.GetSize()) - upgradeTab.TransformToScreenSpace(Vector2.Zero);
+
+					double radius = 5 * DeviceScale;
+					e.Graphics2D.Circle(localLabelEndPosition.X + radius + 3 * DeviceScale,
+						upgradeTab.LocalBounds.Bottom + upgradeTab.Height / 2 - 1 * DeviceScale,
+						radius,
 						theme.PrimaryAccentColor);
 				};
 			}
diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp
index ba51c5c12..1fca5e0a2 160000
--- a/Submodules/agg-sharp
+++ b/Submodules/agg-sharp
@@ -1 +1 @@
-Subproject commit ba51c5c12e8efa9adac7ab8e511bb2880041b198
+Subproject commit 1fca5e0a2e913392761a3cb5fc6ab9f8abbc1c52