From f5d575dec7a440d8bb70d22ab3f5007474275f9e Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Tue, 5 Jan 2021 21:10:00 -0800 Subject: [PATCH 1/2] Improve message --- MatterControlLib/Library/Widgets/StorePage/ExploreSection.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/MatterControlLib/Library/Widgets/StorePage/ExploreSection.cs b/MatterControlLib/Library/Widgets/StorePage/ExploreSection.cs index ba5fd4285..815025131 100644 --- a/MatterControlLib/Library/Widgets/StorePage/ExploreSection.cs +++ b/MatterControlLib/Library/Widgets/StorePage/ExploreSection.cs @@ -108,7 +108,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab VAnchor = VAnchor.Absolute, HAnchor = HAnchor.Right, BackgroundColor = theme.MinimalShade, - Margin = new BorderDouble(right: leftRightMargin) + Margin = new BorderDouble(right: leftRightMargin), + ToolTipText = "Open settings options menu".Localize() }; moreButton.Click += (s, e1) => { From 9471cabdf1bf9579514217066375d07c9b65957c Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Wed, 6 Jan 2021 08:50:36 -0800 Subject: [PATCH 2/2] Fix menu close --- MatterControlLib/Library/Widgets/StorePage/ExploreSection.cs | 1 - MatterControlLib/PartPreviewWindow/PopupButton.cs | 5 ----- MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs | 3 ++- Submodules/MatterSlice | 2 +- Submodules/agg-sharp | 2 +- 5 files changed, 4 insertions(+), 9 deletions(-) diff --git a/MatterControlLib/Library/Widgets/StorePage/ExploreSection.cs b/MatterControlLib/Library/Widgets/StorePage/ExploreSection.cs index 815025131..56ea4a9fe 100644 --- a/MatterControlLib/Library/Widgets/StorePage/ExploreSection.cs +++ b/MatterControlLib/Library/Widgets/StorePage/ExploreSection.cs @@ -109,7 +109,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab HAnchor = HAnchor.Right, BackgroundColor = theme.MinimalShade, Margin = new BorderDouble(right: leftRightMargin), - ToolTipText = "Open settings options menu".Localize() }; moreButton.Click += (s, e1) => { diff --git a/MatterControlLib/PartPreviewWindow/PopupButton.cs b/MatterControlLib/PartPreviewWindow/PopupButton.cs index 055f6d76d..fe3268e12 100644 --- a/MatterControlLib/PartPreviewWindow/PopupButton.cs +++ b/MatterControlLib/PartPreviewWindow/PopupButton.cs @@ -180,11 +180,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow { this.PopupContent.Close(); } - - UiThread.RunOnIdle(() => - { - menuVisibileAtMouseDown = false; - }); }; if (overridePopupHAnchor) diff --git a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs index 59c2349f4..7dc883f93 100644 --- a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs +++ b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs @@ -309,7 +309,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration if (settingsSection.Name == "Slice Simple" && UserSettings.Instance.get(UserSettingsKey.SliceSettingsMoreClicked) != "true") { - var button = new TextButton("More", theme, 8) + var button = new TextButton("More".Localize(), theme, 8) { Margin = new BorderDouble(5, 0), Padding = new BorderDouble(7, 3), @@ -319,6 +319,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration HoverColor = theme.AccentMimimalOverlay, BorderColor = theme.PrimaryAccentColor, RenderOutline = true, + ToolTipText = "Open Settings View Options".Localize() }; button.Click += (s, e) => diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 562919a54..46b47e5e2 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 562919a546ce14166b47ac6ce65bed313cb6566a +Subproject commit 46b47e5e26d806fc4a23d098fa7cab637bf40e47 diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index e9cbf3a10..f4ce5c663 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit e9cbf3a103b6259c538ab337db9f79f64c505a91 +Subproject commit f4ce5c663a639111503d89fa1e4812ee6e944a1d