From b25132b44d6a8f7f4f8e8a70be635b4bf919acab Mon Sep 17 00:00:00 2001 From: LarsBrubaker Date: Sat, 12 Jun 2021 07:59:52 -0700 Subject: [PATCH] Improving default scroll bars --- MatterControlLib/ApplicationView/ApplicationController.cs | 4 ++-- MatterControlLib/ApplicationView/Themes/ThemeConfig.cs | 2 +- MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs | 2 +- MatterControlLib/Utilities/WebUtilities/WebCache.cs | 5 ++++- Submodules/agg-sharp | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/MatterControlLib/ApplicationView/ApplicationController.cs b/MatterControlLib/ApplicationView/ApplicationController.cs index 6403a9f33..4b3d159ed 100644 --- a/MatterControlLib/ApplicationView/ApplicationController.cs +++ b/MatterControlLib/ApplicationView/ApplicationController.cs @@ -971,8 +971,8 @@ namespace MatterHackers.MatterControl } ScrollBar.DefaultMargin = new BorderDouble(right: 1); - ScrollBar.ScrollBarWidth = 8 * GuiWidget.DeviceScale; - ScrollBar.GrowThumbBy = 2; + ScrollBar.ScrollBarWidth = 11 * GuiWidget.DeviceScale; + ScrollBar.GrowThumbBy = 3 * GuiWidget.DeviceScale; // Initialize statics Object3D.AssetsPath = ApplicationDataStorage.Instance.LibraryAssetsPath; diff --git a/MatterControlLib/ApplicationView/Themes/ThemeConfig.cs b/MatterControlLib/ApplicationView/Themes/ThemeConfig.cs index 126aa4a18..53e3a24f8 100644 --- a/MatterControlLib/ApplicationView/Themes/ThemeConfig.cs +++ b/MatterControlLib/ApplicationView/Themes/ThemeConfig.cs @@ -63,7 +63,7 @@ namespace MatterHackers.MatterControl public int DefaultFontSize { get; set; } = 11; - public int DefaultContainerPadding { get; } = 10; + public int DefaultContainerPadding { get; } = 5; public int H1PointSize { get; } = 11; diff --git a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs index 912e0e64a..e21937f32 100644 --- a/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs +++ b/MatterControlLib/SlicerConfiguration/SliceSettingsWidget.cs @@ -59,7 +59,7 @@ namespace MatterHackers.MatterControl.SlicerConfiguration settingsControlBar = new PresetsToolbar(printer, theme) { HAnchor = HAnchor.Stretch, - Padding = new BorderDouble(8, 12, 8, 8) + Padding = new BorderDouble(5) }; using (this.LayoutLock()) diff --git a/MatterControlLib/Utilities/WebUtilities/WebCache.cs b/MatterControlLib/Utilities/WebUtilities/WebCache.cs index 63182bae1..a8c321ded 100644 --- a/MatterControlLib/Utilities/WebUtilities/WebCache.cs +++ b/MatterControlLib/Utilities/WebUtilities/WebCache.cs @@ -193,7 +193,10 @@ namespace MatterHackers.MatterControl // save the as png lock (locker) { - ImageIO.SaveImageData(pngFileName, asyncImageSequence.Frames[0]); + if (!File.Exists(pngFileName)) + { + ImageIO.SaveImageData(pngFileName, asyncImageSequence.Frames[0]); + } } } else // save original stream as gif diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index dc1a8ad90..b14006236 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit dc1a8ad90c2428b06ef3cfa3f7471264e71d974a +Subproject commit b14006236ace31299510018726e43c09958e10ff