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

Migrate color SectionWidget to color button in toolbar

Browse source
This commit is contained in:
John Lewin 2018-09-07 18:14:51 -07:00
parent cac3d7d24c
commit 364a2bcb78
4 changed files with 110 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

88
MatterControlLib/PartPreviewWindow/ItemColorButton.cs Normal file
View file

@ -0,0 +1,88 @@
/*
Copyright (c) 2018, 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.Linq;
using MatterHackers.Agg;
using MatterHackers.Agg.Image;
using MatterHackers.Agg.UI;
using MatterHackers.DataConverters3D;
using MatterHackers.Localizations;
namespace MatterHackers.MatterControl.PartPreviewWindow
{
public class ItemColorButton : PopupButton
{
private ColorButton colorButton;
public ItemColorButton(InteractiveScene scene, ThemeConfig theme)
{
this.ToolTipText = "Color".Localize();
this.DynamicPopupContent = () =>
{
return new ColorSwatchSelector(scene, theme, buttonSize: 16, buttonSpacing: new BorderDouble(1, 1, 0, 0), colorNotifier: (newColor) => colorButton.BackgroundColor = newColor)
{
Padding = theme.DefaultContainerPadding,
BackgroundColor = this.HoverColor
};
};
var scaledButtonSize = 14 * GuiWidget.DeviceScale;
colorButton = new ColorButton(scene.SelectedItem?.Color ?? theme.SlightShade)
{
Width = scaledButtonSize,
Height = scaledButtonSize,
HAnchor = HAnchor.Center,
VAnchor = VAnchor.Center
};
this.AddChild(colorButton);
}
public override void OnLoad(EventArgs args)
{
var firstBackgroundColor = this.Parents<GuiWidget>().Where(p => p.BackgroundColor.Alpha0To1 == 1).FirstOrDefault()?.BackgroundColor;
if (firstBackgroundColor != null)
{
// Resolve alpha
this.HoverColor = new BlenderRGBA().Blend(firstBackgroundColor.Value, this.HoverColor);
}
base.OnLoad(args);
}
public Color Color
{
get => colorButton.BackgroundColor;
set => colorButton.BackgroundColor = value;
}
}
}

22
MatterControlLib/PartPreviewWindow/SelectedObjectPanel.cs
View file

@ -96,6 +96,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
var scene = sceneContext.Scene;
var itemColorButton = new ItemColorButton(scene, theme)
{
Width = 30,
Height = 30,
};
toolbar.AddChild(itemColorButton);
// put in a make permanent button
var icon = AggContext.StaticData.LoadIcon("noun_766157.png", 16, 16, theme.InvertIcons).SetPreMultiply();
var applyButton = new IconButton(icon, theme)
@ -178,19 +185,6 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.ContentPanel.AddChild(editorSectionWidget);
var colorSection = new SectionWidget(
"Color".Localize(),
new ColorSwatchSelector(scene, theme, buttonSize: 16, buttonSpacing: new BorderDouble(1, 1, 0, 0))
{
Margin = new BorderDouble(left: 10)
},
theme,
serializationKey: UserSettingsKey.ColorPanelExpanded)
{
Name = "Color Panel",
};
this.ContentPanel.AddChild(colorSection);
var materialsSection = new SectionWidget("Materials".Localize(), new MaterialControls(scene, theme), theme, serializationKey: UserSettingsKey.MaterialsPanelExpanded)
{
Name = "Materials Panel",
@ -216,10 +210,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
scene.SelectionChanged += (s, e) =>
{
itemColorButton.Color = scene.SelectedItem?.Color ?? theme.MinimalShade;
applyButton.Enabled = scene.SelectedItem?.CanApply == true;
removeButton.Enabled = scene.SelectedItem != null;
overflowButton.Enabled = scene.SelectedItem != null;
};
}

19
MatterControlLib/PartPreviewWindow/View3D/ColorSwatchSelector.cs
View file

@ -26,6 +26,7 @@ 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.Platform;
using MatterHackers.Agg.UI;
@ -36,7 +37,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
public class ColorSwatchSelector : FlowLayoutWidget
{
public ColorSwatchSelector(InteractiveScene scene, ThemeConfig theme, BorderDouble buttonSpacing, int buttonSize = 32)
public ColorSwatchSelector(InteractiveScene scene, ThemeConfig theme, BorderDouble buttonSpacing, int buttonSize = 32, Action<Color> colorNotifier = null)
: base(FlowDirection.TopToBottom)
{
var scaledButtonSize = buttonSize * GuiWidget.DeviceScale;
@ -45,6 +46,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
double[] lightness = new double[] { .7, .5, .3 };
Action<Color> colorChanged = (color) =>
{
colorNotifier?.Invoke(color);
};
var grayLevel = new Color[] { Color.White, new Color(180, 180, 180), Color.Gray };
for (int rowIndex = 0; rowIndex < lightness.Length; rowIndex++)
@ -55,11 +61,11 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
for (int colorIndex = 0; colorIndex < colorCount; colorIndex++)
{
var color = ColorF.FromHSL(colorIndex / (double)colorCount, 1, lightness[rowIndex]).ToColor();
colorRow.AddChild(MakeColorButton(scene, color, scaledButtonSize, buttonSpacing));
colorRow.AddChild(MakeColorButton(scene, color, scaledButtonSize, buttonSpacing, colorChanged));
}
// put in white and black buttons
colorRow.AddChild(MakeColorButton(scene, grayLevel[rowIndex], scaledButtonSize, buttonSpacing));
colorRow.AddChild(MakeColorButton(scene, grayLevel[rowIndex], scaledButtonSize, buttonSpacing, colorChanged));
switch(rowIndex)
{
@ -79,17 +85,17 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
break;
case 1:
colorRow.AddChild(MakeColorButton(scene, new Color("#555"), scaledButtonSize, buttonSpacing));
colorRow.AddChild(MakeColorButton(scene, new Color("#555"), scaledButtonSize, buttonSpacing, colorChanged));
break;
case 2:
colorRow.AddChild(MakeColorButton(scene, new Color("#222"), scaledButtonSize, buttonSpacing));
colorRow.AddChild(MakeColorButton(scene, new Color("#222"), scaledButtonSize, buttonSpacing, colorChanged));
break;
}
}
}
private GuiWidget MakeColorButton(InteractiveScene scene, Color color, double buttonSize, BorderDouble buttonSpacing)
private GuiWidget MakeColorButton(InteractiveScene scene, Color color, double buttonSize, BorderDouble buttonSpacing, Action<Color> colorChanged)
{
var button = new ColorButton(color)
{
@ -103,6 +109,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
UiThread.RunOnIdle(() =>
{
scene.UndoBuffer.AddAndDo(new ChangeColor(scene.SelectedItem, button.BackgroundColor));
colorChanged(button.BackgroundColor);
});
};

2
MatterControlLib/PartPreviewWindow/View3D/UndoCommands/ChangeColor.cs
View file

@ -56,7 +56,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
void SetData(List<IObject3D> itemsToChange)
{
{
foreach (var item in itemsToChange)
{
this.itemsToChange.Add(item);