nettika/mattercontrol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made the override settings editors not change the data about the main settings editor

Browse source
This commit is contained in:
Lars Brubaker 2016-07-20 15:16:00 -07:00
parent 59a6c2b0db
commit cd319c9040
2 changed files with 47 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
SlicerConfiguration/SliceSettingsWidget.cs
View file

@ -143,7 +143,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
topCategoryTabs.Margin = new BorderDouble(top: 8);
topCategoryTabs.AnchorAll();
sliceSettingsDetailControl = new SliceSettingsDetailControl();
sliceSettingsDetailControl = new SliceSettingsDetailControl(layerCascade);
List<TabBar> sideTabBarsListForLayout = new List<TabBar>();
for (int topCategoryIndex = 0; topCategoryIndex < SliceSettingsOrganizer.Instance.UserLevels[UserLevel].CategoriesList.Count; topCategoryIndex++)
@ -216,7 +216,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
string selectedTabName = topCategoryTabs.TabBar.SelectedTabName;
if (!string.IsNullOrEmpty(selectedTabName))
{
UserSettings.Instance.set(settingsName, selectedTabName);
if (layerCascade == null)
{
UserSettings.Instance.set(settingsName, selectedTabName);
}
}
};
}
@ -459,7 +462,10 @@ namespace MatterHackers.MatterControl.SlicerConfiguration
string selectedTabName = leftSideGroupTabs.TabBar.SelectedTabName;
if (!string.IsNullOrEmpty(selectedTabName))
{
UserSettings.Instance.set(settingsTypeName, selectedTabName);
if (layerCascade == null)
{
UserSettings.Instance.set(settingsTypeName, selectedTabName);
}
}
};
}