From ee07d3ebfdeb61e97f167cc0da4b288d7bd8ca3b Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Mon, 9 May 2022 18:20:02 -0700 Subject: [PATCH] More emphasis on solid & hole setting --- .../PartPreviewWindow/SelectedObjectPanel.cs | 14 +++++++++++--- Submodules/agg-sharp | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs index 86f52dd89..473b27943 100644 --- a/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs +++ b/MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs @@ -317,9 +317,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow otherText.Text = text; otherContainer.Visible = true; holeText.Underline = false; + holeText.Bold = false; holeButton.BackgroundOutlineWidth = 1; solidText.Underline = false; + solidText.Bold = false; solidButton.BackgroundOutlineWidth = 1; } @@ -330,10 +332,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { case PrintOutputTypes.Hole: holeText.Underline = true; - holeButton.BackgroundOutlineWidth = 2; + holeText.Bold = true; + holeButton.BackgroundOutlineWidth = 2; holeButton.BackgroundRadius = scaledButtonSize / 2 - 1; - solidText.Underline = false; + solidText.Underline = false; + solidText.Bold = false; solidButton.BackgroundOutlineWidth = 1; solidButton.BackgroundRadius = scaledButtonSize / 2; otherContainer.Visible = false; @@ -342,10 +346,12 @@ namespace MatterHackers.MatterControl.PartPreviewWindow case PrintOutputTypes.Default: case PrintOutputTypes.Solid: holeText.Underline = false; + holeText.Bold = false; holeButton.BackgroundOutlineWidth = 1; holeButton.BackgroundRadius = scaledButtonSize / 2; solidText.Underline = true; + solidText.Bold = true; solidButton.BackgroundOutlineWidth = 2; solidButton.BackgroundRadius = scaledButtonSize / 2 - 1; otherContainer.Visible = false; @@ -413,6 +419,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow VAnchor = VAnchor.Center, Margin = new BorderDouble(3, 0), Selectable = true, + AutoExpandBoundsToText = true, }; buttonRow.AddChild(solidText, 0); buttonRow.AddChild(holeButton, 0); @@ -421,7 +428,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow VAnchor = VAnchor.Center, Margin = new BorderDouble(3, 0), Selectable = true, - }; + AutoExpandBoundsToText = true, + }; buttonRow.AddChild(holeText, 0); otherContainer = new GuiWidget() { diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index ef5fad208..8f4e9b969 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit ef5fad208c4bf4361ef0de61de013c8b79b2d977 +Subproject commit 8f4e9b969638d3c70ba81ac4f1a2d8faeda8c73b