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

Merge pull request #3032 from jlewin/design_tools

Browse source 
Revise slider location
This commit is contained in:
johnlewin 2018-02-21 18:50:06 -08:00 • committed by GitHub
commit c5057c8177
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ConfigurationPage/CalibrationSettings/CalibrationControls.cs
View file

@ -48,7 +48,7 @@ namespace MatterHackers.MatterControl.PrinterControls
buttonRow.AddChild(new HorizontalSpacer());
// configure button
var configureIcon = AggContext.StaticData.LoadIcon("fa-cog_16.png", IconColor.Raw);
var configureIcon = AggContext.StaticData.LoadIcon("fa-cog_16.png", IconColor.Theme);
configureButton = new IconButton(configureIcon, theme)
{
ToolTipText = "Configure".Localize(),

2
PartPreviewWindow/PlusTab/ExplorePanel.cs
View file

@ -163,7 +163,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow.PlusTab
toolBarA.AddChild(new VerticalLine(50) { Margin = new BorderDouble(12, 0) });
toolBarA.AddChild(new TextWidget("Open Existing".Localize() + ":", pointSize: theme.DefaultFontSize)
toolBarA.AddChild(new TextWidget("Open Existing".Localize() + ":", textColor: theme.Colors.PrimaryTextColor, pointSize: theme.DefaultFontSize)
{
VAnchor = VAnchor.Center
});

6
PartPreviewWindow/PrinterTabPage.cs
View file

@ -107,7 +107,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
VAnchor = VAnchor.Stretch,
HAnchor = HAnchor.Right | HAnchor.Absolute,
Width = 60,
Margin = new BorderDouble(0, 80, 8, 42),
Margin = new BorderDouble(0, 4, 4, 4),
Maximum = sceneContext.LoadedGCode?.LayerCount ?? 1
};
view3DWidget.InteractionLayer.AddChild(layerScrollbar);
@ -321,8 +321,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
return;
}
layerRenderRatioSlider.OriginRelativeParent = new Vector2(11, 65);
layerRenderRatioSlider.TotalWidthInPixels = view3DWidget.InteractionLayer.Width - 45;
layerRenderRatioSlider.OriginRelativeParent = new Vector2(4, 13);
layerRenderRatioSlider.TotalWidthInPixels = view3DWidget.InteractionLayer.Width - 32;
}
private double lastPostion = 0;