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

Compute and reuse scaled button size

Browse source 
- Issue MatterHackers/MCCentral#3068
Inconsistent scaling in ColorSwatchSelector
This commit is contained in:
John Lewin 2018-04-07 14:50:59 -07:00
parent 20b2252ef0
commit e767a6a84f
1 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

20
PartPreviewWindow/View3D/ColorSwatchSelector.cs
View file

@ -39,6 +39,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public ColorSwatchSelector(InteractiveScene scene, ThemeConfig theme, BorderDouble buttonSpacing, int buttonSize = 32) public ColorSwatchSelector(InteractiveScene scene, ThemeConfig theme, BorderDouble buttonSpacing, int buttonSize = 32)
: base(FlowDirection.TopToBottom) : base(FlowDirection.TopToBottom)
{ {
var scaledButtonSize = buttonSize * GuiWidget.DeviceScale;
int colorCount = 9; int colorCount = 9;
double[] lightness = new double[] { .7, .5, .3 }; double[] lightness = new double[] { .7, .5, .3 };
@ -53,19 +55,19 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
for (int colorIndex = 0; colorIndex < colorCount; colorIndex++) for (int colorIndex = 0; colorIndex < colorCount; colorIndex++)
{ {
var color = ColorF.FromHSL(colorIndex / (double)colorCount, 1, lightness[rowIndex]).ToColor(); var color = ColorF.FromHSL(colorIndex / (double)colorCount, 1, lightness[rowIndex]).ToColor();
colorRow.AddChild(MakeColorButton(scene, color, buttonSize, buttonSpacing)); colorRow.AddChild(MakeColorButton(scene, color, scaledButtonSize, buttonSpacing));
} }
// put in white and black buttons // put in white and black buttons
colorRow.AddChild(MakeColorButton(scene, grayLevel[rowIndex], buttonSize, buttonSpacing)); colorRow.AddChild(MakeColorButton(scene, grayLevel[rowIndex], scaledButtonSize, buttonSpacing));
switch(rowIndex) switch(rowIndex)
{ {
case 0: case 0:
var resetButton = new IconButton(AggContext.StaticData.LoadIcon("transparent_grid.png"), theme) var resetButton = new IconButton(AggContext.StaticData.LoadIcon("transparent_grid.png"), theme)
{ {
Width = buttonSize, Width = scaledButtonSize,
Height = buttonSize, Height = scaledButtonSize,
Margin = buttonSpacing Margin = buttonSpacing
}; };
resetButton.Click += (s, e) => resetButton.Click += (s, e) =>
@ -76,22 +78,22 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
break; break;
case 1: case 1:
colorRow.AddChild(MakeColorButton(scene, new Color("#555"), buttonSize, buttonSpacing)); colorRow.AddChild(MakeColorButton(scene, new Color("#555"), scaledButtonSize, buttonSpacing));
break; break;
case 2: case 2:
colorRow.AddChild(MakeColorButton(scene, new Color("#222"), buttonSize, buttonSpacing)); colorRow.AddChild(MakeColorButton(scene, new Color("#222"), scaledButtonSize, buttonSpacing));
break; break;
} }
} }
} }
private GuiWidget MakeColorButton(InteractiveScene scene, Color color, int buttonSize, BorderDouble buttonSpacing) private GuiWidget MakeColorButton(InteractiveScene scene, Color color, double buttonSize, BorderDouble buttonSpacing)
{ {
return new ColorButton(color, scene) return new ColorButton(color, scene)
{ {
Width = buttonSize * GuiWidget.DeviceScale, Width = buttonSize,
Height = buttonSize * GuiWidget.DeviceScale, Height = buttonSize,
Margin = buttonSpacing Margin = buttonSpacing
}; };
} }