Refactoring
This commit is contained in:
Lars Brubaker
parent
32a192c2b8
commit
6f3fe2fddc
6 changed files with 472 additions and 726 deletions
|
|
@ -1,5 +1,5 @@
|
||||||
/*
|
/*
|
||||||
Copyright (c) 2018, Lars Brubaker, John Lewin
|
Copyright (c) 2022, Lars Brubaker, John Lewin
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
|
@ -75,7 +75,7 @@ namespace MatterHackers.MatterControl
|
||||||
|
|
||||||
public static Dictionary<string, IColorTheme> ThemeProviders { get; }
|
public static Dictionary<string, IColorTheme> ThemeProviders { get; }
|
||||||
|
|
||||||
private static Dictionary<string, string> themes = new Dictionary<string, string>();
|
private static readonly Dictionary<string, string> themes = new();
|
||||||
|
|
||||||
static AppContext()
|
static AppContext()
|
||||||
{
|
{
|
||||||
|
|
@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl
|
||||||
{
|
{
|
||||||
_themeset = JsonConvert.DeserializeObject<ThemeSet>(File.ReadAllText(ProfileManager.Instance.ProfileThemeSetPath));
|
_themeset = JsonConvert.DeserializeObject<ThemeSet>(File.ReadAllText(ProfileManager.Instance.ProfileThemeSetPath));
|
||||||
ThemeSet.Theme.EnsureDefaults();
|
ThemeSet.Theme.EnsureDefaults();
|
||||||
MatterHackersThemeConfigExtensions.RebuildTheme(ThemeSet.Theme);
|
ThemeConfigExtensions.RebuildTheme(ThemeSet.Theme);
|
||||||
|
|
||||||
// If the serialized format is older than the current format, null and fall back to latest default below
|
// If the serialized format is older than the current format, null and fall back to latest default below
|
||||||
if (ThemeSet.SchemeVersion != ThemeSet.LatestSchemeVersion)
|
if (ThemeSet.SchemeVersion != ThemeSet.LatestSchemeVersion)
|
||||||
|
|
@ -131,18 +131,18 @@ namespace MatterHackers.MatterControl
|
||||||
{
|
{
|
||||||
var toolTipPopover = new ClickablePopover(ArrowDirection.Up, new BorderDouble(0, 0), 7, 0);
|
var toolTipPopover = new ClickablePopover(ArrowDirection.Up, new BorderDouble(0, 0), 7, 0);
|
||||||
|
|
||||||
var markdownWidegt = new MarkdownWidget(Theme, false)
|
var markdownWidegt = new MarkdownWidget(Theme, false)
|
||||||
{
|
{
|
||||||
HAnchor = HAnchor.Absolute,
|
HAnchor = HAnchor.Absolute,
|
||||||
VAnchor = VAnchor.Fit,
|
VAnchor = VAnchor.Fit,
|
||||||
Width = 350 * GuiWidget.DeviceScale,
|
Width = 350 * GuiWidget.DeviceScale,
|
||||||
BackgroundColor = Theme.BackgroundColor,
|
BackgroundColor = Theme.BackgroundColor,
|
||||||
Border = 1,
|
Border = 1,
|
||||||
BorderColor = Color.Black,
|
BorderColor = Color.Black,
|
||||||
};
|
Markdown = toolTipText
|
||||||
|
};
|
||||||
markdownWidegt.Markdown = toolTipText;
|
|
||||||
markdownWidegt.Width = 350 * GuiWidget.DeviceScale;
|
markdownWidegt.Width = 350 * GuiWidget.DeviceScale;
|
||||||
var maxLineWidth = 0.0;
|
var maxLineWidth = 0.0;
|
||||||
if (markdownWidegt.Descendants<ParagraphX>().Any())
|
if (markdownWidegt.Descendants<ParagraphX>().Any())
|
||||||
{
|
{
|
||||||
|
|
@ -164,7 +164,7 @@ namespace MatterHackers.MatterControl
|
||||||
|
|
||||||
var themeConfig = JsonConvert.DeserializeObject<ThemeConfig>(json);
|
var themeConfig = JsonConvert.DeserializeObject<ThemeConfig>(json);
|
||||||
themeConfig.EnsureDefaults();
|
themeConfig.EnsureDefaults();
|
||||||
MatterHackersThemeConfigExtensions.RebuildTheme(ThemeSet.Theme);
|
ThemeConfigExtensions.RebuildTheme(ThemeSet.Theme);
|
||||||
|
|
||||||
return themeConfig;
|
return themeConfig;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
58
MatterControlLib/ApplicationView/Themes/SplitButtonParams.cs
Normal file
58
MatterControlLib/ApplicationView/Themes/SplitButtonParams.cs
Normal file
|
|
@ -0,0 +1,58 @@
|
||||||
|
/*
|
||||||
|
Copyright (c) 2022, Lars Brubaker, John Lewin
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
|
1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
list of conditions and the following disclaimer.
|
||||||
|
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer in the documentation
|
||||||
|
and/or other materials provided with the distribution.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
The views and conclusions contained in the software and documentation are those
|
||||||
|
of the authors and should not be interpreted as representing official policies,
|
||||||
|
either expressed or implied, of the FreeBSD Project.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
|
using MatterHackers.Agg;
|
||||||
|
using MatterHackers.Agg.Image;
|
||||||
|
using MatterHackers.Agg.UI;
|
||||||
|
using MatterHackers.MatterControl.PartPreviewWindow;
|
||||||
|
|
||||||
|
namespace MatterHackers.MatterControl
|
||||||
|
{
|
||||||
|
public class SplitButtonParams
|
||||||
|
{
|
||||||
|
public ImageBuffer Icon { get; set; }
|
||||||
|
|
||||||
|
public bool ButtonEnabled { get; set; } = true;
|
||||||
|
|
||||||
|
public string ButtonName { get; set; }
|
||||||
|
|
||||||
|
public Action<GuiWidget> ButtonAction { get; set; }
|
||||||
|
|
||||||
|
public string ButtonTooltip { get; set; }
|
||||||
|
|
||||||
|
public Action MenuAction { get; set; }
|
||||||
|
|
||||||
|
public Action<PopupMenu> ExtendPopupMenu { get; set; }
|
||||||
|
|
||||||
|
public string ButtonText { get; set; }
|
||||||
|
|
||||||
|
public Color BackgroundColor { get; set; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,692 +0,0 @@
|
||||||
/*
|
|
||||||
Copyright (c) 2019, Lars Brubaker, John Lewin
|
|
||||||
All rights reserved.
|
|
||||||
|
|
||||||
Redistribution and use in source and binary forms, with or without
|
|
||||||
modification, are permitted provided that the following conditions are met:
|
|
||||||
|
|
||||||
1. Redistributions of source code must retain the above copyright notice, this
|
|
||||||
list of conditions and the following disclaimer.
|
|
||||||
2. Redistributions in binary form must reproduce the above copyright notice,
|
|
||||||
this list of conditions and the following disclaimer in the documentation
|
|
||||||
and/or other materials provided with the distribution.
|
|
||||||
|
|
||||||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
||||||
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
||||||
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
||||||
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
|
||||||
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
|
||||||
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
|
||||||
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
|
||||||
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
||||||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
|
||||||
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
||||||
|
|
||||||
The views and conclusions contained in the software and documentation are those
|
|
||||||
of the authors and should not be interpreted as representing official policies,
|
|
||||||
either expressed or implied, of the FreeBSD Project.
|
|
||||||
*/
|
|
||||||
|
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using MatterHackers.Agg;
|
|
||||||
using MatterHackers.Agg.Image;
|
|
||||||
using MatterHackers.Agg.Platform;
|
|
||||||
using MatterHackers.Agg.UI;
|
|
||||||
using MatterHackers.ImageProcessing;
|
|
||||||
using MatterHackers.Localizations;
|
|
||||||
using MatterHackers.MatterControl.CustomWidgets;
|
|
||||||
using MatterHackers.MatterControl.PartPreviewWindow;
|
|
||||||
using MatterHackers.MatterControl.PrinterCommunication;
|
|
||||||
using MatterHackers.VectorMath;
|
|
||||||
|
|
||||||
namespace MatterHackers.MatterControl
|
|
||||||
{
|
|
||||||
public class ThemeConfig3
|
|
||||||
{
|
|
||||||
public int FontSize7 { get; } = 7;
|
|
||||||
|
|
||||||
public int FontSize8 { get; } = 8;
|
|
||||||
|
|
||||||
public int FontSize9 { get; } = 9;
|
|
||||||
|
|
||||||
public int FontSize10 { get; } = 10;
|
|
||||||
|
|
||||||
public int FontSize11 { get; } = 11;
|
|
||||||
|
|
||||||
public int FontSize12 { get; } = 12;
|
|
||||||
|
|
||||||
public int FontSize14 { get; } = 14;
|
|
||||||
|
|
||||||
public int DefaultFontSize { get; set; } = 11;
|
|
||||||
|
|
||||||
public int DefaultContainerPadding { get; } = 5;
|
|
||||||
|
|
||||||
public int H1PointSize { get; } = 11;
|
|
||||||
|
|
||||||
public double ButtonHeight => 32 * GuiWidget.DeviceScale;
|
|
||||||
|
|
||||||
public double TabButtonHeight => 30 * GuiWidget.DeviceScale;
|
|
||||||
|
|
||||||
public double MenuGutterWidth => 35 * GuiWidget.DeviceScale;
|
|
||||||
|
|
||||||
private readonly int defaultScrollBarWidth = 120;
|
|
||||||
|
|
||||||
public void MakeRoundedButton(GuiWidget button, Color? boarderColor = null)
|
|
||||||
{
|
|
||||||
if (button is TextButton textButton)
|
|
||||||
{
|
|
||||||
textButton.VAnchor |= VAnchor.Fit;
|
|
||||||
textButton.HAnchor |= HAnchor.Fit;
|
|
||||||
textButton.HoverColor = this.AccentMimimalOverlay;
|
|
||||||
textButton.Padding = new BorderDouble(7, 5);
|
|
||||||
if (boarderColor != null)
|
|
||||||
{
|
|
||||||
textButton.BorderColor = boarderColor.Value;
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
textButton.BorderColor = this.TextColor;
|
|
||||||
}
|
|
||||||
textButton.BackgroundOutlineWidth = 1;
|
|
||||||
textButton.BackgroundRadius = textButton.Height / 2;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public BorderDouble TextButtonPadding { get; } = new BorderDouble(14, 0);
|
|
||||||
|
|
||||||
public BorderDouble ButtonSpacing { get; } = new BorderDouble(right: 3);
|
|
||||||
|
|
||||||
public BorderDouble ToolbarPadding { get; } = 3;
|
|
||||||
|
|
||||||
public BorderDouble TabbarPadding { get; } = new BorderDouble(3, 1);
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets the height or width of a given vertical or horizontal splitter bar
|
|
||||||
/// </summary>
|
|
||||||
public int SplitterWidth
|
|
||||||
{
|
|
||||||
get
|
|
||||||
{
|
|
||||||
double splitterSize = 6 * GuiWidget.DeviceScale;
|
|
||||||
|
|
||||||
if (GuiWidget.TouchScreenMode)
|
|
||||||
{
|
|
||||||
splitterSize *= 1.4;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (int)splitterSize;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public PresetColors PresetColors { get; set; } = new PresetColors();
|
|
||||||
|
|
||||||
public bool IsDarkTheme { get; set; }
|
|
||||||
|
|
||||||
public Color SlightShade { get; set; }
|
|
||||||
|
|
||||||
public Color MinimalShade { get; set; }
|
|
||||||
|
|
||||||
public Color Shade { get; set; }
|
|
||||||
|
|
||||||
public Color DarkShade { get; set; }
|
|
||||||
|
|
||||||
public Color BackgroundColor { get; set; }
|
|
||||||
|
|
||||||
public Color TextColor { get; set; } = Color.Black;
|
|
||||||
|
|
||||||
public Color TabBarBackground { get; set; }
|
|
||||||
|
|
||||||
public Color InactiveTabColor { get; set; }
|
|
||||||
|
|
||||||
public Color InteractionLayerOverlayColor { get; set; }
|
|
||||||
|
|
||||||
public TextWidget CreateHeading(string text)
|
|
||||||
{
|
|
||||||
return new TextWidget(text, pointSize: this.H1PointSize, textColor: this.TextColor, bold: true)
|
|
||||||
{
|
|
||||||
Margin = new BorderDouble(0, 5)
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public Color SplitterBackground { get; set; } = new Color(0, 0, 0, 60);
|
|
||||||
|
|
||||||
public Color TabBodyBackground { get; set; }
|
|
||||||
|
|
||||||
public Color ToolbarButtonBackground { get; set; } = Color.Transparent;
|
|
||||||
|
|
||||||
public Color ToolbarButtonHover => this.SlightShade;
|
|
||||||
|
|
||||||
public Color ToolbarButtonDown => this.MinimalShade;
|
|
||||||
|
|
||||||
public Color ThumbnailBackground { get; set; }
|
|
||||||
|
|
||||||
public Color AccentMimimalOverlay { get; set; }
|
|
||||||
|
|
||||||
public BorderDouble SeparatorMargin { get; }
|
|
||||||
|
|
||||||
public class StateColor
|
|
||||||
{
|
|
||||||
public Color BackgroundColor { get; set; }
|
|
||||||
|
|
||||||
public Color ForegroundColor { get; set; }
|
|
||||||
|
|
||||||
public Color BorderColor { get; set; }
|
|
||||||
|
|
||||||
public Color TextColor { get; set; }
|
|
||||||
|
|
||||||
public Color LightTextColor { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class ThreeStateColor
|
|
||||||
{
|
|
||||||
public StateColor Focused { get; set; } = new StateColor();
|
|
||||||
|
|
||||||
public StateColor Hovered { get; set; } = new StateColor();
|
|
||||||
|
|
||||||
public StateColor Inactive { get; set; } = new StateColor();
|
|
||||||
}
|
|
||||||
|
|
||||||
public class DropListStyle : ThreeStateColor
|
|
||||||
{
|
|
||||||
public StateColor Open { get; set; } = new StateColor();
|
|
||||||
}
|
|
||||||
|
|
||||||
public ThreeStateColor EditFieldColors { get; set; } = new ThreeStateColor();
|
|
||||||
|
|
||||||
public Color LightTextColor { get; set; }
|
|
||||||
|
|
||||||
public Color BorderColor { get; set; }
|
|
||||||
|
|
||||||
public Color BorderColor40 { get; set; }
|
|
||||||
|
|
||||||
public Color BorderColor20 { get; set; }
|
|
||||||
|
|
||||||
public Color RowBorder { get; set; }
|
|
||||||
|
|
||||||
public DropListStyle DropList { get; set; } = new DropListStyle();
|
|
||||||
|
|
||||||
public Color DisabledColor { get; set; }
|
|
||||||
|
|
||||||
public Color SplashAccentColor { get; set; }
|
|
||||||
|
|
||||||
public Color BedBackgroundColor { get; set; }
|
|
||||||
|
|
||||||
public Color PrimaryAccentColor { get; set; }
|
|
||||||
|
|
||||||
public Color SectionBackgroundColor { get; set; }
|
|
||||||
|
|
||||||
public Color PopupBorderColor { get; set; }
|
|
||||||
|
|
||||||
public Color BedColor { get; set; }
|
|
||||||
|
|
||||||
public Color UnderBedColor { get; set; }
|
|
||||||
|
|
||||||
public Color PrinterBedTextColor { get; set; }
|
|
||||||
|
|
||||||
public GridColors BedGridColors { get; set; } = new GridColors();
|
|
||||||
public double ButtonRadius { get; set; } = 3;
|
|
||||||
|
|
||||||
public void SetDefaults()
|
|
||||||
{
|
|
||||||
this.DisabledColor = new Color(this.LightTextColor, 50);
|
|
||||||
this.SplashAccentColor = new Color(this.PrimaryAccentColor, 185).OverlayOn(Color.White).ToColor();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Color GetBorderColor(int alpha)
|
|
||||||
{
|
|
||||||
return new Color(this.BorderColor, alpha);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compute an opaque color from a source and a target with alpha
|
|
||||||
public Color ResolveColor(Color background, Color overlay)
|
|
||||||
{
|
|
||||||
return ResolveColor2(background, overlay);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Compute an opaque color from a source and a target with alpha
|
|
||||||
public static Color ResolveColor2(Color background, Color overlay)
|
|
||||||
{
|
|
||||||
return new BlenderBGRA().Blend(background, overlay);
|
|
||||||
}
|
|
||||||
|
|
||||||
public SolidSlider CreateSolidSlider(GuiWidget wordOptionContainer, string header, ThemeConfig theme, double min = 0, double max = .5)
|
|
||||||
{
|
|
||||||
double scrollBarWidth = 10;
|
|
||||||
|
|
||||||
wordOptionContainer.AddChild(new TextWidget(header, textColor: this.TextColor)
|
|
||||||
{
|
|
||||||
Margin = new BorderDouble(10, 3, 3, 5),
|
|
||||||
HAnchor = HAnchor.Left
|
|
||||||
});
|
|
||||||
|
|
||||||
var namedSlider = new SolidSlider(new Vector2(), scrollBarWidth, theme, 0, 1)
|
|
||||||
{
|
|
||||||
TotalWidthInPixels = defaultScrollBarWidth,
|
|
||||||
Minimum = min,
|
|
||||||
Maximum = max,
|
|
||||||
Margin = new BorderDouble(12, 4),
|
|
||||||
HAnchor = HAnchor.Stretch,
|
|
||||||
};
|
|
||||||
|
|
||||||
wordOptionContainer.AddChild(namedSlider);
|
|
||||||
|
|
||||||
return namedSlider;
|
|
||||||
}
|
|
||||||
|
|
||||||
public MenuItem CreateCheckboxMenuItem(string text, string itemValue, bool itemChecked, BorderDouble padding, EventHandler eventHandler)
|
|
||||||
{
|
|
||||||
var checkbox = new CheckBox(text)
|
|
||||||
{
|
|
||||||
Checked = itemChecked
|
|
||||||
};
|
|
||||||
checkbox.CheckedStateChanged += eventHandler;
|
|
||||||
|
|
||||||
return new MenuItem(checkbox, itemValue)
|
|
||||||
{
|
|
||||||
Padding = padding,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ApplyBottomBorder(GuiWidget widget, bool shadedBorder = false)
|
|
||||||
{
|
|
||||||
widget.BorderColor = shadedBorder ? this.MinimalShade : this.BorderColor20;
|
|
||||||
|
|
||||||
this.ApplyBorder(widget, new BorderDouble(bottom: 1), shadedBorder);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void ApplyBorder(GuiWidget widget, BorderDouble border, bool shadedBorder = false)
|
|
||||||
{
|
|
||||||
widget.BorderColor = shadedBorder ? this.MinimalShade : this.BorderColor20;
|
|
||||||
widget.Border = border;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public class PresetColors
|
|
||||||
{
|
|
||||||
public Color MaterialPreset { get; set; } = Color.Orange;
|
|
||||||
|
|
||||||
public Color ScenePreset { get; set; } = Color.Green;
|
|
||||||
|
|
||||||
public Color QualityPreset { get; set; } = Color.Yellow;
|
|
||||||
|
|
||||||
public Color UserOverride { get; set; } = new Color(68, 95, 220, 150);
|
|
||||||
}
|
|
||||||
|
|
||||||
public class GridColors
|
|
||||||
{
|
|
||||||
public Color Red { get; set; }
|
|
||||||
|
|
||||||
public Color Green { get; set; }
|
|
||||||
|
|
||||||
public Color Blue { get; set; }
|
|
||||||
|
|
||||||
public Color Line { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public class SplitButtonParams
|
|
||||||
{
|
|
||||||
public ImageBuffer Icon { get; set; }
|
|
||||||
|
|
||||||
public bool ButtonEnabled { get; set; } = true;
|
|
||||||
|
|
||||||
public string ButtonName { get; set; }
|
|
||||||
|
|
||||||
public Action<GuiWidget> ButtonAction { get; set; }
|
|
||||||
|
|
||||||
public string ButtonTooltip { get; set; }
|
|
||||||
|
|
||||||
public Action MenuAction { get; set; }
|
|
||||||
|
|
||||||
public Action<PopupMenu> ExtendPopupMenu { get; set; }
|
|
||||||
|
|
||||||
public string ButtonText { get; set; }
|
|
||||||
|
|
||||||
public Color BackgroundColor { get; set; }
|
|
||||||
}
|
|
||||||
|
|
||||||
public static class MatterHackersThemeConfigExtensions
|
|
||||||
{
|
|
||||||
public static JogControls.MoveButton CreateMoveButton(this ThemeConfig config, PrinterConfig printer, string label, PrinterConnection.Axis axis, double movementFeedRate, bool levelingButtons = false)
|
|
||||||
{
|
|
||||||
return new JogControls.MoveButton(label, printer, axis, movementFeedRate, config)
|
|
||||||
{
|
|
||||||
BackgroundColor = config.MinimalShade,
|
|
||||||
BorderColor = config.BorderColor40,
|
|
||||||
BackgroundOutlineWidth = 1,
|
|
||||||
VAnchor = VAnchor.Absolute,
|
|
||||||
HAnchor = HAnchor.Absolute,
|
|
||||||
Margin = 0,
|
|
||||||
Padding = 0,
|
|
||||||
Height = (levelingButtons ? 45 : 40) * GuiWidget.DeviceScale,
|
|
||||||
Width = (levelingButtons ? 90 : 40) * GuiWidget.DeviceScale,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public static JogControls.ExtrudeButton CreateExtrudeButton(this ThemeConfig config, PrinterConfig printer, string label, double movementFeedRate, int extruderNumber, bool levelingButtons = false)
|
|
||||||
{
|
|
||||||
return new JogControls.ExtrudeButton(printer, label, movementFeedRate, extruderNumber, config)
|
|
||||||
{
|
|
||||||
BackgroundColor = config.MinimalShade,
|
|
||||||
BorderColor = config.BorderColor40,
|
|
||||||
BackgroundOutlineWidth = 1,
|
|
||||||
VAnchor = VAnchor.Absolute,
|
|
||||||
HAnchor = HAnchor.Absolute,
|
|
||||||
Margin = 0,
|
|
||||||
Padding = 0,
|
|
||||||
Height = (levelingButtons ? 45 : 40) * GuiWidget.DeviceScale,
|
|
||||||
Width = (levelingButtons ? 90 : 40) * GuiWidget.DeviceScale,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public static PopupMenuButton CreateSplitButton(this ThemeConfig config, SplitButtonParams buttonParams, OperationGroup operationGroup = null)
|
|
||||||
{
|
|
||||||
PopupMenuButton menuButton = null;
|
|
||||||
|
|
||||||
GuiWidget innerButton;
|
|
||||||
if (buttonParams.ButtonText == null)
|
|
||||||
{
|
|
||||||
innerButton = new IconButton(buttonParams.Icon, config)
|
|
||||||
{
|
|
||||||
Name = buttonParams.ButtonName + " Inner SplitButton",
|
|
||||||
Enabled = buttonParams.ButtonEnabled,
|
|
||||||
ToolTipText = buttonParams.ButtonTooltip,
|
|
||||||
};
|
|
||||||
|
|
||||||
// Remove right Padding for drop style
|
|
||||||
innerButton.Padding = innerButton.Padding.Clone(right: 0);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (buttonParams.Icon == null)
|
|
||||||
{
|
|
||||||
innerButton = new TextButton(buttonParams.ButtonText, config)
|
|
||||||
{
|
|
||||||
Name = buttonParams.ButtonName,
|
|
||||||
Enabled = buttonParams.ButtonEnabled,
|
|
||||||
ToolTipText = buttonParams.ButtonTooltip,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
innerButton = new TextIconButton(buttonParams.ButtonText, buttonParams.Icon, config)
|
|
||||||
{
|
|
||||||
Name = buttonParams.ButtonName,
|
|
||||||
Enabled = buttonParams.ButtonEnabled,
|
|
||||||
ToolTipText = buttonParams.ButtonTooltip,
|
|
||||||
Padding = new BorderDouble(5, 0, 5, 0)
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
innerButton.Click += (s, e) =>
|
|
||||||
{
|
|
||||||
buttonParams.ButtonAction.Invoke(menuButton);
|
|
||||||
};
|
|
||||||
|
|
||||||
|
|
||||||
if (operationGroup == null)
|
|
||||||
{
|
|
||||||
menuButton = new PopupMenuButton(innerButton, config);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
menuButton = new OperationGroupButton(operationGroup, innerButton, config);
|
|
||||||
}
|
|
||||||
|
|
||||||
var theme = ApplicationController.Instance.MenuTheme;
|
|
||||||
menuButton.DynamicPopupContent = () =>
|
|
||||||
{
|
|
||||||
var popupMenu = new PopupMenu(theme);
|
|
||||||
buttonParams.ExtendPopupMenu?.Invoke(popupMenu);
|
|
||||||
|
|
||||||
return popupMenu;
|
|
||||||
};
|
|
||||||
|
|
||||||
menuButton.Name = buttonParams.ButtonName + " Menu SplitButton";
|
|
||||||
menuButton.BackgroundColor = buttonParams.BackgroundColor;
|
|
||||||
if (menuButton.BackgroundColor == Color.Transparent)
|
|
||||||
{
|
|
||||||
menuButton.BackgroundColor = config.ToolbarButtonBackground;
|
|
||||||
}
|
|
||||||
|
|
||||||
menuButton.HoverColor = config.ToolbarButtonHover;
|
|
||||||
menuButton.MouseDownColor = config.ToolbarButtonDown;
|
|
||||||
menuButton.DrawArrow = true;
|
|
||||||
menuButton.Margin = config.ButtonSpacing;
|
|
||||||
menuButton.DistinctPopupButton = true;
|
|
||||||
menuButton.BackgroundRadius = new RadiusCorners(theme.ButtonRadius * GuiWidget.DeviceScale, theme.ButtonRadius * GuiWidget.DeviceScale, 0, 0);
|
|
||||||
|
|
||||||
innerButton.Selectable = true;
|
|
||||||
return menuButton;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static GuiWidget CreateSearchButton(this ThemeConfig config)
|
|
||||||
{
|
|
||||||
return new IconButton(StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).SetToColor(config.TextColor), config)
|
|
||||||
{
|
|
||||||
ToolTipText = "Search".Localize(),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public static double MicroButtonHeight => 20 * GuiWidget.DeviceScale;
|
|
||||||
private static double MicroButtonWidth => 30 * GuiWidget.DeviceScale;
|
|
||||||
|
|
||||||
public static RadioTextButton CreateMicroRadioButton(this ThemeConfig config, string text, IList<GuiWidget> siblingRadioButtonList = null)
|
|
||||||
{
|
|
||||||
var radioButton = new RadioTextButton(text, config, config.FontSize8)
|
|
||||||
{
|
|
||||||
SiblingRadioButtonList = siblingRadioButtonList,
|
|
||||||
Padding = new BorderDouble(5, 0),
|
|
||||||
SelectedBackgroundColor = config.SlightShade,
|
|
||||||
UnselectedBackgroundColor = config.SlightShade,
|
|
||||||
HoverColor = config.AccentMimimalOverlay,
|
|
||||||
Margin = new BorderDouble(right: 1),
|
|
||||||
HAnchor = HAnchor.Absolute,
|
|
||||||
Height = config.MicroButtonHeight,
|
|
||||||
Width = MicroButtonWidth
|
|
||||||
};
|
|
||||||
|
|
||||||
// Add to sibling list if supplied
|
|
||||||
siblingRadioButtonList?.Add(radioButton);
|
|
||||||
|
|
||||||
return radioButton;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static FlowLayoutWidget CreateMenuItems(this ThemeConfig config, PopupMenu popupMenu, IEnumerable<NamedAction> menuActions)
|
|
||||||
{
|
|
||||||
// Create menu items in the DropList for each element in this.menuActions
|
|
||||||
foreach (var menuAction in menuActions)
|
|
||||||
{
|
|
||||||
if (menuAction is ActionSeparator)
|
|
||||||
{
|
|
||||||
popupMenu.CreateSeparator();
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if (menuAction is NamedActionGroup namedActionButtons)
|
|
||||||
{
|
|
||||||
var content = new FlowLayoutWidget()
|
|
||||||
{
|
|
||||||
HAnchor = HAnchor.Fit | HAnchor.Stretch
|
|
||||||
};
|
|
||||||
|
|
||||||
var textWidget = new TextWidget(menuAction.Title, pointSize: config.DefaultFontSize, textColor: config.TextColor)
|
|
||||||
{
|
|
||||||
// Padding = MenuPadding,
|
|
||||||
VAnchor = VAnchor.Center
|
|
||||||
};
|
|
||||||
content.AddChild(textWidget);
|
|
||||||
|
|
||||||
content.AddChild(new HorizontalSpacer());
|
|
||||||
|
|
||||||
foreach (var actionButton in namedActionButtons.Group)
|
|
||||||
{
|
|
||||||
var button = new TextButton(actionButton.Title, config)
|
|
||||||
{
|
|
||||||
Border = new BorderDouble(1, 0, 0, 0),
|
|
||||||
BorderColor = config.MinimalShade,
|
|
||||||
HoverColor = config.AccentMimimalOverlay,
|
|
||||||
Enabled = actionButton.IsEnabled()
|
|
||||||
};
|
|
||||||
|
|
||||||
content.AddChild(button);
|
|
||||||
|
|
||||||
if (actionButton.IsEnabled())
|
|
||||||
{
|
|
||||||
button.Click += (s, e) =>
|
|
||||||
{
|
|
||||||
actionButton.Action();
|
|
||||||
popupMenu.Unfocus();
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
var menuItem = new PopupMenu.MenuItem(content, config)
|
|
||||||
{
|
|
||||||
HAnchor = HAnchor.Fit | HAnchor.Stretch,
|
|
||||||
VAnchor = VAnchor.Fit,
|
|
||||||
HoverColor = Color.Transparent,
|
|
||||||
};
|
|
||||||
popupMenu.AddChild(menuItem);
|
|
||||||
menuItem.Padding = new BorderDouble(menuItem.Padding.Left,
|
|
||||||
menuItem.Padding.Bottom,
|
|
||||||
0,
|
|
||||||
menuItem.Padding.Top);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
PopupMenu.MenuItem menuItem;
|
|
||||||
|
|
||||||
if (menuAction is NamedBoolAction boolAction)
|
|
||||||
{
|
|
||||||
menuItem = popupMenu.CreateBoolMenuItem(menuAction.Title, boolAction.GetIsActive, boolAction.SetIsActive);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
menuItem = popupMenu.CreateMenuItem(menuAction.Title, menuAction.Icon, menuAction.Shortcut);
|
|
||||||
}
|
|
||||||
|
|
||||||
menuItem.Name = $"{menuAction.Title} Menu Item";
|
|
||||||
|
|
||||||
menuItem.Enabled = menuAction is NamedActionGroup
|
|
||||||
|| (menuAction.Action != null && menuAction.IsEnabled?.Invoke() != false);
|
|
||||||
|
|
||||||
menuItem.ClearRemovedFlag();
|
|
||||||
|
|
||||||
if (menuItem.Enabled)
|
|
||||||
{
|
|
||||||
menuItem.Click += (s, e) =>
|
|
||||||
{
|
|
||||||
menuAction.Action();
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return popupMenu;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void ApplyPrimaryActionStyle(this ThemeConfig config, GuiWidget guiWidget)
|
|
||||||
{
|
|
||||||
guiWidget.BackgroundColor = new Color(config.AccentMimimalOverlay, 50);
|
|
||||||
|
|
||||||
Color hoverColor = config.AccentMimimalOverlay;
|
|
||||||
|
|
||||||
switch (guiWidget)
|
|
||||||
{
|
|
||||||
case PopupMenuButton menuButton:
|
|
||||||
menuButton.HoverColor = hoverColor;
|
|
||||||
break;
|
|
||||||
case SimpleFlowButton flowButton:
|
|
||||||
flowButton.HoverColor = hoverColor;
|
|
||||||
break;
|
|
||||||
case SimpleButton button:
|
|
||||||
button.HoverColor = hoverColor;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void RemovePrimaryActionStyle(this ThemeConfig config, GuiWidget guiWidget)
|
|
||||||
{
|
|
||||||
guiWidget.BackgroundColor = Color.Transparent;
|
|
||||||
|
|
||||||
// Buttons in toolbars should revert to ToolbarButtonHover when reset
|
|
||||||
bool parentIsToolbar = guiWidget.Parent?.Parent is Toolbar;
|
|
||||||
|
|
||||||
switch (guiWidget)
|
|
||||||
{
|
|
||||||
case SimpleFlowButton flowButton:
|
|
||||||
flowButton.HoverColor = parentIsToolbar ? config.ToolbarButtonHover : Color.Transparent;
|
|
||||||
break;
|
|
||||||
case SimpleButton button:
|
|
||||||
button.HoverColor = parentIsToolbar ? config.ToolbarButtonHover : Color.Transparent;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static SolidSlider ApplySliderStyle(this ThemeConfig config, SolidSlider solidSlider)
|
|
||||||
{
|
|
||||||
solidSlider.View.TrackColor = config.SlightShade;
|
|
||||||
solidSlider.View.TrackRadius = 4;
|
|
||||||
|
|
||||||
return solidSlider;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static DoubleSolidSlider ApplySliderStyle(this ThemeConfig config, DoubleSolidSlider solidSlider)
|
|
||||||
{
|
|
||||||
solidSlider.View.TrackColor = config.SlightShade;
|
|
||||||
solidSlider.View.TrackRadius = 4;
|
|
||||||
|
|
||||||
return solidSlider;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static SectionWidget ApplyBoxStyle(this ThemeConfig config, SectionWidget sectionWidget)
|
|
||||||
{
|
|
||||||
return config.ApplyBoxStyle(
|
|
||||||
sectionWidget,
|
|
||||||
config.SectionBackgroundColor,
|
|
||||||
margin: new BorderDouble(config.DefaultContainerPadding, 0, config.DefaultContainerPadding, config.DefaultContainerPadding));
|
|
||||||
}
|
|
||||||
|
|
||||||
// ApplySquareBoxStyle
|
|
||||||
public static SectionWidget ApplyBoxStyle(this ThemeConfig config, SectionWidget sectionWidget, BorderDouble margin)
|
|
||||||
{
|
|
||||||
sectionWidget.BackgroundColor = config.SectionBackgroundColor;
|
|
||||||
sectionWidget.Margin = 0;
|
|
||||||
sectionWidget.Border = new BorderDouble(bottom: 1);
|
|
||||||
sectionWidget.BorderColor = config.RowBorder;
|
|
||||||
|
|
||||||
return sectionWidget;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static SectionWidget ApplyBoxStyle(this ThemeConfig config, SectionWidget sectionWidget, Color backgroundColor, BorderDouble margin)
|
|
||||||
{
|
|
||||||
// Enforce panel padding
|
|
||||||
// sectionWidget.ContentPanel.Padding = new BorderDouble(10, 0, 10, 2);
|
|
||||||
// sectionWidget.ContentPanel.Padding = 0;
|
|
||||||
|
|
||||||
sectionWidget.BorderColor = Color.Transparent;
|
|
||||||
sectionWidget.BorderRadius = 5;
|
|
||||||
sectionWidget.Margin = margin;
|
|
||||||
sectionWidget.BackgroundColor = backgroundColor;
|
|
||||||
|
|
||||||
return sectionWidget;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static GuiWidget CreateSmallResetButton(this ThemeConfig config)
|
|
||||||
{
|
|
||||||
return new HoverImageWidget(config.RestoreNormal, config.RestoreHover)
|
|
||||||
{
|
|
||||||
VAnchor = VAnchor.Center,
|
|
||||||
Margin = new BorderDouble(0, 0, 5, 0)
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void RebuildTheme(this ThemeConfig config)
|
|
||||||
{
|
|
||||||
config.GeneratingThumbnailIcon = StaticData.Instance.LoadIcon("building_thumbnail_40x40.png", 40, 40).SetToColor(config.TextColor);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
389
MatterControlLib/ApplicationView/Themes/ThemeConfigExtensions.cs
Normal file
389
MatterControlLib/ApplicationView/Themes/ThemeConfigExtensions.cs
Normal file
|
|
@ -0,0 +1,389 @@
|
||||||
|
/*
|
||||||
|
Copyright (c) 2022, Lars Brubaker, John Lewin
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use in source and binary forms, with or without
|
||||||
|
modification, are permitted provided that the following conditions are met:
|
||||||
|
|
||||||
|
1. Redistributions of source code must retain the above copyright notice, this
|
||||||
|
list of conditions and the following disclaimer.
|
||||||
|
2. Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
this list of conditions and the following disclaimer in the documentation
|
||||||
|
and/or other materials provided with the distribution.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
||||||
|
ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
|
||||||
|
ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
|
||||||
|
The views and conclusions contained in the software and documentation are those
|
||||||
|
of the authors and should not be interpreted as representing official policies,
|
||||||
|
either expressed or implied, of the FreeBSD Project.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using MatterHackers.Agg;
|
||||||
|
using MatterHackers.Agg.Platform;
|
||||||
|
using MatterHackers.Agg.UI;
|
||||||
|
using MatterHackers.ImageProcessing;
|
||||||
|
using MatterHackers.Localizations;
|
||||||
|
using MatterHackers.MatterControl.CustomWidgets;
|
||||||
|
using MatterHackers.MatterControl.PartPreviewWindow;
|
||||||
|
using MatterHackers.MatterControl.PrinterCommunication;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
|
||||||
|
namespace MatterHackers.MatterControl
|
||||||
|
{
|
||||||
|
public static class ThemeConfigExtensions
|
||||||
|
{
|
||||||
|
public static double MicroButtonHeight => 20 * GuiWidget.DeviceScale;
|
||||||
|
|
||||||
|
private static double MicroButtonWidth => 30 * GuiWidget.DeviceScale;
|
||||||
|
|
||||||
|
public static SectionWidget ApplyBoxStyle(this ThemeConfig config, SectionWidget sectionWidget)
|
||||||
|
{
|
||||||
|
return config.ApplyBoxStyle(
|
||||||
|
sectionWidget,
|
||||||
|
config.SectionBackgroundColor,
|
||||||
|
margin: new BorderDouble(config.DefaultContainerPadding, 0, config.DefaultContainerPadding, config.DefaultContainerPadding));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ApplySquareBoxStyle
|
||||||
|
public static SectionWidget ApplyBoxStyle(this ThemeConfig config, SectionWidget sectionWidget, BorderDouble margin)
|
||||||
|
{
|
||||||
|
sectionWidget.BackgroundColor = config.SectionBackgroundColor;
|
||||||
|
sectionWidget.Margin = 0;
|
||||||
|
sectionWidget.Border = new BorderDouble(bottom: 1);
|
||||||
|
sectionWidget.BorderColor = config.RowBorder;
|
||||||
|
|
||||||
|
return sectionWidget;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static SectionWidget ApplyBoxStyle(this ThemeConfig config, SectionWidget sectionWidget, Color backgroundColor, BorderDouble margin)
|
||||||
|
{
|
||||||
|
// Enforce panel padding
|
||||||
|
// sectionWidget.ContentPanel.Padding = new BorderDouble(10, 0, 10, 2);
|
||||||
|
// sectionWidget.ContentPanel.Padding = 0;
|
||||||
|
|
||||||
|
sectionWidget.BorderColor = Color.Transparent;
|
||||||
|
sectionWidget.BorderRadius = 5;
|
||||||
|
sectionWidget.Margin = margin;
|
||||||
|
sectionWidget.BackgroundColor = backgroundColor;
|
||||||
|
|
||||||
|
return sectionWidget;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void ApplyPrimaryActionStyle(this ThemeConfig config, GuiWidget guiWidget)
|
||||||
|
{
|
||||||
|
guiWidget.BackgroundColor = new Color(config.AccentMimimalOverlay, 50);
|
||||||
|
|
||||||
|
Color hoverColor = config.AccentMimimalOverlay;
|
||||||
|
|
||||||
|
switch (guiWidget)
|
||||||
|
{
|
||||||
|
case PopupMenuButton menuButton:
|
||||||
|
menuButton.HoverColor = hoverColor;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SimpleFlowButton flowButton:
|
||||||
|
flowButton.HoverColor = hoverColor;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SimpleButton button:
|
||||||
|
button.HoverColor = hoverColor;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static SolidSlider ApplySliderStyle(this ThemeConfig config, SolidSlider solidSlider)
|
||||||
|
{
|
||||||
|
solidSlider.View.TrackColor = config.SlightShade;
|
||||||
|
solidSlider.View.TrackRadius = 4;
|
||||||
|
|
||||||
|
return solidSlider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static DoubleSolidSlider ApplySliderStyle(this ThemeConfig config, DoubleSolidSlider solidSlider)
|
||||||
|
{
|
||||||
|
solidSlider.View.TrackColor = config.SlightShade;
|
||||||
|
solidSlider.View.TrackRadius = 4;
|
||||||
|
|
||||||
|
return solidSlider;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static JogControls.ExtrudeButton CreateExtrudeButton(this ThemeConfig config, PrinterConfig printer, string label, double movementFeedRate, int extruderNumber, bool levelingButtons = false)
|
||||||
|
{
|
||||||
|
return new JogControls.ExtrudeButton(printer, label, movementFeedRate, extruderNumber, config)
|
||||||
|
{
|
||||||
|
BackgroundColor = config.MinimalShade,
|
||||||
|
BorderColor = config.BorderColor40,
|
||||||
|
BackgroundOutlineWidth = 1,
|
||||||
|
VAnchor = VAnchor.Absolute,
|
||||||
|
HAnchor = HAnchor.Absolute,
|
||||||
|
Margin = 0,
|
||||||
|
Padding = 0,
|
||||||
|
Height = (levelingButtons ? 45 : 40) * GuiWidget.DeviceScale,
|
||||||
|
Width = (levelingButtons ? 90 : 40) * GuiWidget.DeviceScale,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public static FlowLayoutWidget CreateMenuItems(this ThemeConfig config, PopupMenu popupMenu, IEnumerable<NamedAction> menuActions)
|
||||||
|
{
|
||||||
|
// Create menu items in the DropList for each element in this.menuActions
|
||||||
|
foreach (var menuAction in menuActions)
|
||||||
|
{
|
||||||
|
if (menuAction is ActionSeparator)
|
||||||
|
{
|
||||||
|
popupMenu.CreateSeparator();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (menuAction is NamedActionGroup namedActionButtons)
|
||||||
|
{
|
||||||
|
var content = new FlowLayoutWidget()
|
||||||
|
{
|
||||||
|
HAnchor = HAnchor.Fit | HAnchor.Stretch
|
||||||
|
};
|
||||||
|
|
||||||
|
var textWidget = new TextWidget(menuAction.Title, pointSize: config.DefaultFontSize, textColor: config.TextColor)
|
||||||
|
{
|
||||||
|
// Padding = MenuPadding,
|
||||||
|
VAnchor = VAnchor.Center
|
||||||
|
};
|
||||||
|
content.AddChild(textWidget);
|
||||||
|
|
||||||
|
content.AddChild(new HorizontalSpacer());
|
||||||
|
|
||||||
|
foreach (var actionButton in namedActionButtons.Group)
|
||||||
|
{
|
||||||
|
var button = new TextButton(actionButton.Title, config)
|
||||||
|
{
|
||||||
|
Border = new BorderDouble(1, 0, 0, 0),
|
||||||
|
BorderColor = config.MinimalShade,
|
||||||
|
HoverColor = config.AccentMimimalOverlay,
|
||||||
|
Enabled = actionButton.IsEnabled()
|
||||||
|
};
|
||||||
|
|
||||||
|
content.AddChild(button);
|
||||||
|
|
||||||
|
if (actionButton.IsEnabled())
|
||||||
|
{
|
||||||
|
button.Click += (s, e) =>
|
||||||
|
{
|
||||||
|
actionButton.Action();
|
||||||
|
popupMenu.Unfocus();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var menuItem = new PopupMenu.MenuItem(content, config)
|
||||||
|
{
|
||||||
|
HAnchor = HAnchor.Fit | HAnchor.Stretch,
|
||||||
|
VAnchor = VAnchor.Fit,
|
||||||
|
HoverColor = Color.Transparent,
|
||||||
|
};
|
||||||
|
popupMenu.AddChild(menuItem);
|
||||||
|
menuItem.Padding = new BorderDouble(menuItem.Padding.Left,
|
||||||
|
menuItem.Padding.Bottom,
|
||||||
|
0,
|
||||||
|
menuItem.Padding.Top);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
PopupMenu.MenuItem menuItem;
|
||||||
|
|
||||||
|
if (menuAction is NamedBoolAction boolAction)
|
||||||
|
{
|
||||||
|
menuItem = popupMenu.CreateBoolMenuItem(menuAction.Title, boolAction.GetIsActive, boolAction.SetIsActive);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
menuItem = popupMenu.CreateMenuItem(menuAction.Title, menuAction.Icon, menuAction.Shortcut);
|
||||||
|
}
|
||||||
|
|
||||||
|
menuItem.Name = $"{menuAction.Title} Menu Item";
|
||||||
|
|
||||||
|
menuItem.Enabled = menuAction is NamedActionGroup
|
||||||
|
|| (menuAction.Action != null && menuAction.IsEnabled?.Invoke() != false);
|
||||||
|
|
||||||
|
menuItem.ClearRemovedFlag();
|
||||||
|
|
||||||
|
if (menuItem.Enabled)
|
||||||
|
{
|
||||||
|
menuItem.Click += (s, e) =>
|
||||||
|
{
|
||||||
|
menuAction.Action();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return popupMenu;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static RadioTextButton CreateMicroRadioButton(this ThemeConfig config, string text, IList<GuiWidget> siblingRadioButtonList = null)
|
||||||
|
{
|
||||||
|
var radioButton = new RadioTextButton(text, config, config.FontSize8)
|
||||||
|
{
|
||||||
|
SiblingRadioButtonList = siblingRadioButtonList,
|
||||||
|
Padding = new BorderDouble(5, 0),
|
||||||
|
SelectedBackgroundColor = config.SlightShade,
|
||||||
|
UnselectedBackgroundColor = config.SlightShade,
|
||||||
|
HoverColor = config.AccentMimimalOverlay,
|
||||||
|
Margin = new BorderDouble(right: 1),
|
||||||
|
HAnchor = HAnchor.Absolute,
|
||||||
|
Height = config.MicroButtonHeight,
|
||||||
|
Width = MicroButtonWidth
|
||||||
|
};
|
||||||
|
|
||||||
|
// Add to sibling list if supplied
|
||||||
|
siblingRadioButtonList?.Add(radioButton);
|
||||||
|
|
||||||
|
return radioButton;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static JogControls.MoveButton CreateMoveButton(this ThemeConfig config, PrinterConfig printer, string label, PrinterConnection.Axis axis, double movementFeedRate, bool levelingButtons = false)
|
||||||
|
{
|
||||||
|
return new JogControls.MoveButton(label, printer, axis, movementFeedRate, config)
|
||||||
|
{
|
||||||
|
BackgroundColor = config.MinimalShade,
|
||||||
|
BorderColor = config.BorderColor40,
|
||||||
|
BackgroundOutlineWidth = 1,
|
||||||
|
VAnchor = VAnchor.Absolute,
|
||||||
|
HAnchor = HAnchor.Absolute,
|
||||||
|
Margin = 0,
|
||||||
|
Padding = 0,
|
||||||
|
Height = (levelingButtons ? 45 : 40) * GuiWidget.DeviceScale,
|
||||||
|
Width = (levelingButtons ? 90 : 40) * GuiWidget.DeviceScale,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public static GuiWidget CreateSearchButton(this ThemeConfig config)
|
||||||
|
{
|
||||||
|
return new IconButton(StaticData.Instance.LoadIcon("icon_search_24x24.png", 16, 16).SetToColor(config.TextColor), config)
|
||||||
|
{
|
||||||
|
ToolTipText = "Search".Localize(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public static GuiWidget CreateSmallResetButton(this ThemeConfig config)
|
||||||
|
{
|
||||||
|
return new HoverImageWidget(config.RestoreNormal, config.RestoreHover)
|
||||||
|
{
|
||||||
|
VAnchor = VAnchor.Center,
|
||||||
|
Margin = new BorderDouble(0, 0, 5, 0)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
public static PopupMenuButton CreateSplitButton(this ThemeConfig config, SplitButtonParams buttonParams, OperationGroup operationGroup = null)
|
||||||
|
{
|
||||||
|
PopupMenuButton menuButton = null;
|
||||||
|
|
||||||
|
GuiWidget innerButton;
|
||||||
|
if (buttonParams.ButtonText == null)
|
||||||
|
{
|
||||||
|
innerButton = new IconButton(buttonParams.Icon, config)
|
||||||
|
{
|
||||||
|
Name = buttonParams.ButtonName + " Inner SplitButton",
|
||||||
|
Enabled = buttonParams.ButtonEnabled,
|
||||||
|
ToolTipText = buttonParams.ButtonTooltip,
|
||||||
|
};
|
||||||
|
|
||||||
|
// Remove right Padding for drop style
|
||||||
|
innerButton.Padding = innerButton.Padding.Clone(right: 0);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (buttonParams.Icon == null)
|
||||||
|
{
|
||||||
|
innerButton = new TextButton(buttonParams.ButtonText, config)
|
||||||
|
{
|
||||||
|
Name = buttonParams.ButtonName,
|
||||||
|
Enabled = buttonParams.ButtonEnabled,
|
||||||
|
ToolTipText = buttonParams.ButtonTooltip,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
innerButton = new TextIconButton(buttonParams.ButtonText, buttonParams.Icon, config)
|
||||||
|
{
|
||||||
|
Name = buttonParams.ButtonName,
|
||||||
|
Enabled = buttonParams.ButtonEnabled,
|
||||||
|
ToolTipText = buttonParams.ButtonTooltip,
|
||||||
|
Padding = new BorderDouble(5, 0, 5, 0)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
innerButton.Click += (s, e) =>
|
||||||
|
{
|
||||||
|
buttonParams.ButtonAction.Invoke(menuButton);
|
||||||
|
};
|
||||||
|
|
||||||
|
if (operationGroup == null)
|
||||||
|
{
|
||||||
|
menuButton = new PopupMenuButton(innerButton, config);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
menuButton = new OperationGroupButton(operationGroup, innerButton, config);
|
||||||
|
}
|
||||||
|
|
||||||
|
var theme = ApplicationController.Instance.MenuTheme;
|
||||||
|
menuButton.DynamicPopupContent = () =>
|
||||||
|
{
|
||||||
|
var popupMenu = new PopupMenu(theme);
|
||||||
|
buttonParams.ExtendPopupMenu?.Invoke(popupMenu);
|
||||||
|
|
||||||
|
return popupMenu;
|
||||||
|
};
|
||||||
|
|
||||||
|
menuButton.Name = buttonParams.ButtonName + " Menu SplitButton";
|
||||||
|
menuButton.BackgroundColor = buttonParams.BackgroundColor;
|
||||||
|
if (menuButton.BackgroundColor == Color.Transparent)
|
||||||
|
{
|
||||||
|
menuButton.BackgroundColor = config.ToolbarButtonBackground;
|
||||||
|
}
|
||||||
|
|
||||||
|
menuButton.HoverColor = config.ToolbarButtonHover;
|
||||||
|
menuButton.MouseDownColor = config.ToolbarButtonDown;
|
||||||
|
menuButton.DrawArrow = true;
|
||||||
|
menuButton.Margin = config.ButtonSpacing;
|
||||||
|
menuButton.DistinctPopupButton = true;
|
||||||
|
menuButton.BackgroundRadius = new RadiusCorners(theme.ButtonRadius * GuiWidget.DeviceScale, theme.ButtonRadius * GuiWidget.DeviceScale, 0, 0);
|
||||||
|
|
||||||
|
innerButton.Selectable = true;
|
||||||
|
return menuButton;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void RebuildTheme(this ThemeConfig config)
|
||||||
|
{
|
||||||
|
config.GeneratingThumbnailIcon = StaticData.Instance.LoadIcon("building_thumbnail_40x40.png", 40, 40).SetToColor(config.TextColor);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void RemovePrimaryActionStyle(this ThemeConfig config, GuiWidget guiWidget)
|
||||||
|
{
|
||||||
|
guiWidget.BackgroundColor = Color.Transparent;
|
||||||
|
|
||||||
|
// Buttons in toolbars should revert to ToolbarButtonHover when reset
|
||||||
|
bool parentIsToolbar = guiWidget.Parent?.Parent is Toolbar;
|
||||||
|
|
||||||
|
switch (guiWidget)
|
||||||
|
{
|
||||||
|
case SimpleFlowButton flowButton:
|
||||||
|
flowButton.HoverColor = parentIsToolbar ? config.ToolbarButtonHover : Color.Transparent;
|
||||||
|
break;
|
||||||
|
|
||||||
|
case SimpleButton button:
|
||||||
|
button.HoverColor = parentIsToolbar ? config.ToolbarButtonHover : Color.Transparent;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -44,11 +44,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage
|
||||||
{
|
{
|
||||||
public class ThemeColorPanel : FlowLayoutWidget
|
public class ThemeColorPanel : FlowLayoutWidget
|
||||||
{
|
{
|
||||||
private Color lastColor;
|
private readonly AccentColorsWidget colorSelector;
|
||||||
private AccentColorsWidget colorSelector;
|
private readonly ThemeConfig theme;
|
||||||
private ThemeConfig theme;
|
|
||||||
private IColorTheme _themeProvider;
|
private IColorTheme _themeProvider;
|
||||||
private GuiWidget previewButtonPanel;
|
private readonly GuiWidget previewButtonPanel;
|
||||||
|
|
||||||
public ThemeColorPanel(ThemeConfig theme, AccentColorsWidget colorSelector)
|
public ThemeColorPanel(ThemeConfig theme, AccentColorsWidget colorSelector)
|
||||||
: base (FlowDirection.TopToBottom)
|
: base (FlowDirection.TopToBottom)
|
||||||
|
|
@ -67,8 +66,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage
|
||||||
_themeProvider = AppContext.ThemeProviders.Values.First();
|
_themeProvider = AppContext.ThemeProviders.Values.First();
|
||||||
}
|
}
|
||||||
|
|
||||||
accentPanelColor = theme.ResolveColor(theme.SectionBackgroundColor, theme.SlightShade);
|
|
||||||
|
|
||||||
this.SelectionColor = theme.MinimalShade;
|
this.SelectionColor = theme.MinimalShade;
|
||||||
|
|
||||||
this.AddChild(previewButtonPanel = new FlowLayoutWidget()
|
this.AddChild(previewButtonPanel = new FlowLayoutWidget()
|
||||||
|
|
@ -83,8 +80,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage
|
||||||
|
|
||||||
public ImageBuffer CheckMark { get; } = StaticData.Instance.LoadIcon("fa-check_16.png", 16, 16, invertImage: true);
|
public ImageBuffer CheckMark { get; } = StaticData.Instance.LoadIcon("fa-check_16.png", 16, 16, invertImage: true);
|
||||||
|
|
||||||
private Color accentPanelColor;
|
|
||||||
|
|
||||||
public Color SelectionColor { get; private set; }
|
public Color SelectionColor { get; private set; }
|
||||||
|
|
||||||
public IColorTheme ThemeProvider
|
public IColorTheme ThemeProvider
|
||||||
|
|
@ -104,8 +99,6 @@ namespace MatterHackers.MatterControl.ConfigurationPage
|
||||||
{
|
{
|
||||||
previewButtonPanel.CloseChildren();
|
previewButtonPanel.CloseChildren();
|
||||||
|
|
||||||
var accentColor = theme.PrimaryAccentColor;
|
|
||||||
|
|
||||||
int providerIndex = 0;
|
int providerIndex = 0;
|
||||||
|
|
||||||
foreach (var provider in AppContext.ThemeProviders.Values)
|
foreach (var provider in AppContext.ThemeProviders.Values)
|
||||||
|
|
@ -210,10 +203,8 @@ namespace MatterHackers.MatterControl.ConfigurationPage
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetThemeColor(ThemeSet themeSet, Color accentColor, string mode = null)
|
public void SetThemeColor(ThemeSet themeSet, Color accentColor)
|
||||||
{
|
{
|
||||||
lastColor = accentColor;
|
|
||||||
|
|
||||||
if (colorSelector != null)
|
if (colorSelector != null)
|
||||||
{
|
{
|
||||||
foreach (var colorButton in colorSelector.ColorButtons)
|
foreach (var colorButton in colorSelector.ColorButtons)
|
||||||
|
|
@ -232,10 +223,10 @@ namespace MatterHackers.MatterControl.ConfigurationPage
|
||||||
|
|
||||||
public class AccentColorsWidget : FlowLayoutWidget
|
public class AccentColorsWidget : FlowLayoutWidget
|
||||||
{
|
{
|
||||||
private int containerHeight;
|
private readonly int containerHeight;
|
||||||
private int buttonSpacing;
|
private readonly int buttonSpacing;
|
||||||
private List<ColorButton> colorButtons = new List<ColorButton>();
|
private readonly List<ColorButton> colorButtons = new();
|
||||||
private ThemeSet themeSet;
|
private readonly ThemeSet themeSet;
|
||||||
|
|
||||||
public AccentColorsWidget(ThemeSet themeSet, int buttonHeight = 18, int buttonSpacing = 3)
|
public AccentColorsWidget(ThemeSet themeSet, int buttonHeight = 18, int buttonSpacing = 3)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
Subproject commit 36ed349d6c4e2cb317d85289c4f54120bb2c6590
|
Subproject commit 3e6a51dc89c50b69e62613bc7922508a75a2cd42
|
||||||
Loading…
Add table
Add a link
Reference in a new issue