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

Name consistency on slider constructor params.

Browse source 
Made the touch screen adjustment slider size smaller
This commit is contained in:
Lars Brubaker 2015-01-05 11:31:52 -08:00
parent d74105a532
commit 634031b9ce
2 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CustomWidgets/SolidSlider.cs
View file

@ -243,17 +243,17 @@ namespace MatterHackers.MatterControl
public bool SmallChange { get; set; }
public bool LargeChange { get; set; }
public SolidSlider(Vector2 positionOfTrackFirstValue, double widthInPixels, double minimum = 0, double maximum = 1, Orientation orientation = Orientation.Horizontal)
public SolidSlider(Vector2 positionOfTrackFirstValue, double thumbWidth, double minimum = 0, double maximum = 1, Orientation orientation = Orientation.Horizontal)
{
View = new SolidSlideView(this);
View.TrackHeight = widthInPixels;
View.TrackHeight = thumbWidth;
OriginRelativeParent = positionOfTrackFirstValue;
//TotalWidthInPixels = widthInPixels;
Orientation = orientation;
Minimum = minimum;
Maximum = maximum;
ThumbWidth = widthInPixels;
ThumbHeight = widthInPixels * 1.4;
ThumbWidth = thumbWidth;
ThumbHeight = thumbWidth * 1.4;
MinimumSize = new Vector2(Width, Height);
}

18
PrinterControls/ControlWidgets/AdjustmentControls.cs
View file

@ -69,14 +69,12 @@ namespace MatterHackers.MatterControl.PrinterControls
tuningRatiosLayout.HAnchor = HAnchor.ParentLeftRight;
tuningRatiosLayout.Padding = new BorderDouble(3, 0, 3, 0) * TextWidget.GlobalPointSizeScaleRatio;
double sliderWidth;
double sliderWidth = 300;
double sliderThumbWidth = 10;
if (ActiveTheme.Instance.DisplayMode == ActiveTheme.ApplicationDisplayType.Touchscreen)
{
sliderWidth = 20;
}
else
{
sliderWidth = 10;
sliderWidth = 280;
sliderThumbWidth = 20;
}
TextWidget subheader = new TextWidget("Fine-tune adjustment while actively printing", pointSize: 8, textColor: ActiveTheme.Instance.PrimaryTextColor);
@ -98,10 +96,10 @@ namespace MatterHackers.MatterControl.PrinterControls
feedRateDescription.TextColor = ActiveTheme.Instance.PrimaryTextColor;
feedRateDescription.VAnchor = VAnchor.ParentCenter;
feedRateLeftToRight.AddChild(feedRateDescription);
feedRateRatioSlider = new SolidSlider(new Vector2(), sliderWidth, minFeedRateRatio, maxFeedRateRatio);
feedRateRatioSlider = new SolidSlider(new Vector2(), sliderThumbWidth, minFeedRateRatio, maxFeedRateRatio);
feedRateRatioSlider.Margin = new BorderDouble(5, 0);
feedRateRatioSlider.Value = PrinterConnectionAndCommunication.Instance.FeedRateRatio;
feedRateRatioSlider.TotalWidthInPixels = 300;
feedRateRatioSlider.TotalWidthInPixels = sliderWidth;
feedRateRatioSlider.View.BackgroundColor = new RGBA_Bytes();
feedRateRatioSlider.ValueChanged += (sender, e) =>
{
@ -143,8 +141,8 @@ namespace MatterHackers.MatterControl.PrinterControls
extrusionDescription.TextColor = ActiveTheme.Instance.PrimaryTextColor;
extrusionDescription.VAnchor = VAnchor.ParentCenter;
leftToRight.AddChild(extrusionDescription);
extrusionRatioSlider = new SolidSlider(new Vector2(), sliderWidth, minExtrutionRatio, maxExtrusionRatio, Orientation.Horizontal);
extrusionRatioSlider.TotalWidthInPixels = 300;
extrusionRatioSlider = new SolidSlider(new Vector2(), sliderThumbWidth, minExtrutionRatio, maxExtrusionRatio, Orientation.Horizontal);
extrusionRatioSlider.TotalWidthInPixels = sliderWidth;
extrusionRatioSlider.Margin = new BorderDouble(5, 0);
extrusionRatioSlider.Value = PrinterConnectionAndCommunication.Instance.ExtrusionRatio;
extrusionRatioSlider.View.BackgroundColor = new RGBA_Bytes();