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

making design tabs save width

Browse source
This commit is contained in:
LarsBrubaker 2020-06-07 23:09:01 -07:00
parent f97e367120
commit 2fafdccae5
6 changed files with 25 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

19
MatterControlLib/ApplicationView/PrinterViewState.cs
View file

@ -167,25 +167,6 @@ namespace MatterHackers.MatterControl
}
}
public double SelectedObjectPanelWidth
{
get
{
if (double.TryParse(UserSettings.Instance.get(UserSettingsKey.SelectedObjectPanelWidth), out double controlWidth))
{
return Math.Max(controlWidth, 150);
}
return 200;
}
set
{
var minimumValue = Math.Max(value, 150);
UserSettings.Instance.set(UserSettingsKey.SelectedObjectPanelWidth, minimumValue.ToString());
}
}
public bool SlicingItem { get; set; }
}
}

4
MatterControlLib/PartPreviewWindow/PrinterTabPage.cs
View file

@ -164,7 +164,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
gcodeContainer = new VerticalResizeContainer(theme, GrabBarSide.Left)
{
Width = printer?.ViewState.SelectedObjectPanelWidth ?? 200,
Width = UserSettings.Instance.SelectedObjectPanelWidth,
VAnchor = VAnchor.Stretch,
HAnchor = HAnchor.Absolute,
SplitterBarColor = theme.SplitterBackground,
@ -177,7 +177,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
if (printer != null)
{
printer.ViewState.SelectedObjectPanelWidth = gcodeContainer.Width;
UserSettings.Instance.SelectedObjectPanelWidth = gcodeContainer.Width;
}
};

7
MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs
View file

@ -158,7 +158,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
modelViewSidePanel = new VerticalResizeContainer(theme, GrabBarSide.Left)
{
Width = printer?.ViewState.SelectedObjectPanelWidth ?? 250,
Width = UserSettings.Instance.SelectedObjectPanelWidth,
VAnchor = VAnchor.Stretch,
HAnchor = HAnchor.Absolute,
BackgroundColor = theme.InteractionLayerOverlayColor,
@ -467,10 +467,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void ModelViewSidePanel_Resized(object sender, EventArgs e)
{
if (this.Printer != null)
{
this.Printer.ViewState.SelectedObjectPanelWidth = selectedObjectPanel.Width;
}
UserSettings.Instance.SelectedObjectPanelWidth = selectedObjectPanel.Width;
}
private void UpdateRenderView(object sender, EventArgs e)

19
MatterControlLib/SettingsManagement/UserSettings.cs
View file

@ -265,5 +265,24 @@ namespace MatterHackers.MatterControl
return string.IsNullOrWhiteSpace(showContainers) || showContainers == "1";
}
}
public double SelectedObjectPanelWidth
{
get
{
if (double.TryParse(UserSettings.Instance.get(UserSettingsKey.SelectedObjectPanelWidth), out double controlWidth))
{
return Math.Max(controlWidth, 150);
}
return 200;
}
set
{
var minimumValue = Math.Max(value, 150);
UserSettings.Instance.set(UserSettingsKey.SelectedObjectPanelWidth, minimumValue.ToString());
}
}
}
}

2
Submodules/MatterSlice

@ -1 +1 @@
Subproject commit 9222f0ec0f438ea800d8a3a104dfd8707895810a
Subproject commit 1ae7c91cfac9c80a40662c23503584ef13136012

2
Submodules/agg-sharp

@ -1 +1 @@
Subproject commit eeb34ce683872e34e488c6301335de8c011b4c63
Subproject commit 7264ed51faa05febd6f3ef49c114c3e5ebbfb901