Merge pull request #4945 from larsbrubaker/master

main
This commit is contained in:
Lars Brubaker 2021-01-06 09:18:43 -08:00 committed by GitHub
commit aec5aaebc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 5 additions and 9 deletions

View file

@ -108,7 +108,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
VAnchor = VAnchor.Absolute,
HAnchor = HAnchor.Right,
BackgroundColor = theme.MinimalShade,
Margin = new BorderDouble(right: leftRightMargin)
Margin = new BorderDouble(right: leftRightMargin),
};
moreButton.Click += (s, e1) =>
{

View file

@ -180,11 +180,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
this.PopupContent.Close();
}
UiThread.RunOnIdle(() =>
{
menuVisibileAtMouseDown = false;
});
};
if (overridePopupHAnchor)

View file

@ -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) =>

@ -1 +1 @@
Subproject commit 562919a546ce14166b47ac6ce65bed313cb6566a
Subproject commit 46b47e5e26d806fc4a23d098fa7cab637bf40e47

@ -1 +1 @@
Subproject commit e9cbf3a103b6259c538ab337db9f79f64c505a91
Subproject commit f4ce5c663a639111503d89fa1e4812ee6e944a1d