From eeb3410bc4454bc1d321caca6aa1cd087ef88db7 Mon Sep 17 00:00:00 2001 From: John Lewin Date: Sat, 13 Apr 2019 01:54:38 -0700 Subject: [PATCH] Update one theme for custom bed colors - Issue MatterHackers/MCCentral#5325 Migrate to themed bed colors --- .../PartPreviewWindow/SceneViewer/FloorDrawable.cs | 2 +- StaticData/Themes/System/Solarized/Solarized-Light.json | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/MatterControlLib/PartPreviewWindow/SceneViewer/FloorDrawable.cs b/MatterControlLib/PartPreviewWindow/SceneViewer/FloorDrawable.cs index 90a4fc27c..2a5fe2a68 100644 --- a/MatterControlLib/PartPreviewWindow/SceneViewer/FloorDrawable.cs +++ b/MatterControlLib/PartPreviewWindow/SceneViewer/FloorDrawable.cs @@ -80,7 +80,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow if (sceneContext.PrinterShape != null) { - GLHelper.Render(sceneContext.PrinterShape, bedColor, RenderTypes.Shaded, world.ModelviewMatrix); + GLHelper.Render(sceneContext.PrinterShape, theme.BedColor, RenderTypes.Shaded, world.ModelviewMatrix); } } diff --git a/StaticData/Themes/System/Solarized/Solarized-Light.json b/StaticData/Themes/System/Solarized/Solarized-Light.json index b55c51f19..e58558330 100644 --- a/StaticData/Themes/System/Solarized/Solarized-Light.json +++ b/StaticData/Themes/System/Solarized/Solarized-Light.json @@ -42,6 +42,14 @@ "LightTextColor": "#9aabb1" } }, + "BedColor": "#EFE8D7", + "UnderBedColor": "#DBD5C522", + "BedGridColors": { + "Red": "#7F0000", + "Green": "#267F00", + "Blue": "#0026FF", + "Line": "#B5B0A4" + }, "LightTextColor": "#00000000", "BorderColor": "#657B83", "BorderColor40": "#D3C492",