From 6b71d70e0a5c4ee1f5070321bc656d2782179eaf Mon Sep 17 00:00:00 2001 From: John Lewin Date: Thu, 25 Oct 2018 14:43:21 -0700 Subject: [PATCH] Fix typo --- MatterControlLib/CustomWidgets/DockingTabControl.cs | 4 ++-- .../ResizeContainer/VerticalResizeContainer.cs | 10 ++++++---- MatterControlLib/PartPreviewWindow/PrinterTabPage.cs | 2 +- .../PartPreviewWindow/View3D/View3DWidget.cs | 2 +- MatterControlLib/PartPreviewWindow/ViewControls3D.cs | 2 +- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/MatterControlLib/CustomWidgets/DockingTabControl.cs b/MatterControlLib/CustomWidgets/DockingTabControl.cs index 21e6f6583..76e896dab 100644 --- a/MatterControlLib/CustomWidgets/DockingTabControl.cs +++ b/MatterControlLib/CustomWidgets/DockingTabControl.cs @@ -183,7 +183,7 @@ namespace MatterHackers.MatterControl.CustomWidgets { Width = this.ConstrainedWidth, VAnchor = VAnchor.Stretch, - SpliterBarColor = theme.SplitterBackground, + SplitterBarColor = theme.SplitterBackground, SplitterWidth = theme.SplitterWidth, MinimumSize = new Vector2(this.MinDockingWidth, 0) }; @@ -255,7 +255,7 @@ namespace MatterHackers.MatterControl.CustomWidgets VAnchor = VAnchor.Stretch, HAnchor = HAnchor.Right, BackgroundColor = theme.ActiveTabColor, - SpliterBarColor = theme.SplitterBackground, + SplitterBarColor = theme.SplitterBackground, SplitterWidth = theme.SplitterWidth, }; resizeContainer.AddChild(new DockingWindowContent(this, item.widget, item.text, theme) diff --git a/MatterControlLib/CustomWidgets/ResizeContainer/VerticalResizeContainer.cs b/MatterControlLib/CustomWidgets/ResizeContainer/VerticalResizeContainer.cs index 936d9057f..006430147 100644 --- a/MatterControlLib/CustomWidgets/ResizeContainer/VerticalResizeContainer.cs +++ b/MatterControlLib/CustomWidgets/ResizeContainer/VerticalResizeContainer.cs @@ -53,7 +53,7 @@ namespace MatterHackers.MatterControl.CustomWidgets this.grabSide = grabSide; this.HAnchor = HAnchor.Absolute; this.SplitterWidth = theme.SplitterWidth; - this.SpliterBarColor = theme.SplitterBackground; + this.SplitterBarColor = theme.SplitterBackground; } public override Cursors Cursor @@ -71,7 +71,7 @@ namespace MatterHackers.MatterControl.CustomWidgets set => base.Cursor = value; } - public Color SpliterBarColor { get; set; } + public Color SplitterBarColor { get; set; } public int SplitterWidth { @@ -81,6 +81,7 @@ namespace MatterHackers.MatterControl.CustomWidgets if (_splitterWidth != value) { _splitterWidth = value; + if (grabSide == GrabBarSide.Left) { this.Padding = new BorderDouble(_splitterWidth, 0, 0, 0); @@ -89,6 +90,7 @@ namespace MatterHackers.MatterControl.CustomWidgets { this.Padding = new BorderDouble(0, 0, _splitterWidth, 0); } + this.MinimumSize = new VectorMath.Vector2(_splitterWidth, 0); } } @@ -103,11 +105,11 @@ namespace MatterHackers.MatterControl.CustomWidgets { if (grabSide == GrabBarSide.Left) { - graphics2D.FillRectangle(LocalBounds.Left, LocalBounds.Bottom, LocalBounds.Left + this.SplitterWidth, LocalBounds.Top, this.SpliterBarColor); + graphics2D.FillRectangle(LocalBounds.Left, LocalBounds.Bottom, LocalBounds.Left + this.SplitterWidth, LocalBounds.Top, this.SplitterBarColor); } else { - graphics2D.FillRectangle(LocalBounds.Right - this.SplitterWidth, LocalBounds.Bottom, LocalBounds.Right, LocalBounds.Top, this.SpliterBarColor); + graphics2D.FillRectangle(LocalBounds.Right - this.SplitterWidth, LocalBounds.Bottom, LocalBounds.Right, LocalBounds.Top, this.SplitterBarColor); } base.OnDraw(graphics2D); diff --git a/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs index 4429d0053..dbdee9351 100644 --- a/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs +++ b/MatterControlLib/PartPreviewWindow/PrinterTabPage.cs @@ -166,7 +166,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow Width = printer?.ViewState.SelectedObjectPanelWidth ?? 200, VAnchor = VAnchor.Stretch, HAnchor = HAnchor.Absolute, - SpliterBarColor = theme.SplitterBackground, + SplitterBarColor = theme.SplitterBackground, SplitterWidth = theme.SplitterWidth, Visible = false, }; diff --git a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs index c0467e49d..69c29e8c8 100644 --- a/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs +++ b/MatterControlLib/PartPreviewWindow/View3D/View3DWidget.cs @@ -163,7 +163,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow VAnchor = VAnchor.Stretch, HAnchor = HAnchor.Absolute, BackgroundColor = theme.InteractionLayerOverlayColor, - SpliterBarColor = theme.SplitterBackground, + SplitterBarColor = theme.SplitterBackground, SplitterWidth = theme.SplitterWidth, MinimumSize = new Vector2(theme.SplitterWidth, 0) }; diff --git a/MatterControlLib/PartPreviewWindow/ViewControls3D.cs b/MatterControlLib/PartPreviewWindow/ViewControls3D.cs index 65972b555..bcd71ac5b 100644 --- a/MatterControlLib/PartPreviewWindow/ViewControls3D.cs +++ b/MatterControlLib/PartPreviewWindow/ViewControls3D.cs @@ -544,7 +544,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow var verticalResizeContainer = new VerticalResizeContainer(theme, GrabBarSide.Right) { - BackgroundColor = theme.TabBarBackground, + BackgroundColor = Color.Red, Padding = new BorderDouble(0, 0, theme.DefaultContainerPadding / 2, 0), MinimumSize = new Vector2(120, 50), Height = libraryPopup.TransformToScreenSpace(libraryPopup.Position).Y,