Rename ValueDisplayInfo -> InlineEditControl
- Issue MatterHackers/MCCentral#2201 Consider renaming ValueDisplayInfo to better describe behavior
This commit is contained in:
parent
b2bb131902
commit
06e957d7b9
4 changed files with 8 additions and 9 deletions
|
|
@ -1,5 +1,5 @@
|
|||
/*
|
||||
Copyright (c) 2014, Lars Brubaker
|
||||
Copyright (c) 2017, Lars Brubaker, John Lewin
|
||||
All rights reserved.
|
||||
|
||||
Redistribution and use in source and binary forms, with or without
|
||||
|
|
@ -31,16 +31,15 @@ using System;
|
|||
using System.Diagnostics;
|
||||
using MatterHackers.Agg;
|
||||
using MatterHackers.Agg.UI;
|
||||
using MatterHackers.MeshVisualizer;
|
||||
|
||||
namespace MatterHackers.MatterControl.CustomWidgets
|
||||
{
|
||||
public class ValueDisplayInfo : GuiWidget
|
||||
public class InlineEditControl : GuiWidget
|
||||
{
|
||||
private TextWidget numberDisplay;
|
||||
private NumberEdit numberEdit;
|
||||
|
||||
public ValueDisplayInfo(string defaultSizeString = "-0000.00", Agg.Font.Justification justification = Agg.Font.Justification.Left)
|
||||
public InlineEditControl(string defaultSizeString = "-0000.00", Agg.Font.Justification justification = Agg.Font.Justification.Left)
|
||||
{
|
||||
double pointSize = 12;
|
||||
numberDisplay = new TextWidget(defaultSizeString, 0, 0, pointSize, justification: justification)
|
||||
|
|
@ -93,6 +93,7 @@
|
|||
<Compile Include="ControlElements\MHPasswordTextEditWidget.cs" />
|
||||
<Compile Include="ControlElements\TextImageWidget.cs" />
|
||||
<Compile Include="CustomWidgets\DockingTabControl.cs" />
|
||||
<Compile Include="CustomWidgets\InlineEditControl.cs" />
|
||||
<Compile Include="CustomWidgets\PrintingWindow\BasicBody.cs" />
|
||||
<Compile Include="CustomWidgets\PrintingWindow\BedStatusWidget.cs" />
|
||||
<Compile Include="CustomWidgets\PrintingWindow\ExtruderStatusWidget.cs" />
|
||||
|
|
@ -104,7 +105,6 @@
|
|||
<Compile Include="CustomWidgets\NamedAction.cs" />
|
||||
<Compile Include="CustomWidgets\RadioImageWidget.cs" />
|
||||
<Compile Include="CustomWidgets\RadioPanelWidget.cs" />
|
||||
<Compile Include="CustomWidgets\ValueDisplayInfo.cs" />
|
||||
<Compile Include="CustomWidgets\DisableablePanel.cs" />
|
||||
<Compile Include="Library\Interfaces\LibraryExtensionMethods.cs" />
|
||||
<Compile Include="Library\Providers\CreateFolderItem.cs" />
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
{
|
||||
public static int SliderWidth { get; } = (UserSettings.Instance.IsTouchScreen) ? 20 : 10;
|
||||
|
||||
private ValueDisplayInfo currentLayerInfo;
|
||||
private InlineEditControl currentLayerInfo;
|
||||
|
||||
private LayerScrollbar layerScrollbar;
|
||||
private BedConfig sceneContext;
|
||||
|
|
@ -58,7 +58,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
|
||||
layerSlider = layerScrollbar.layerSlider;
|
||||
|
||||
currentLayerInfo = new ValueDisplayInfo("1000")
|
||||
currentLayerInfo = new InlineEditControl("1000")
|
||||
{
|
||||
GetDisplayString = (value) => $"{value + 1}",
|
||||
HAnchor = HAnchor.Absolute,
|
||||
|
|
|
|||
|
|
@ -57,14 +57,14 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
|
|||
private double lineLength = 55;
|
||||
private List<Vector2> lines = new List<Vector2>();
|
||||
private double upArrowSize = 7 * GuiWidget.DeviceScale;
|
||||
private ValueDisplayInfo zHeightDisplayInfo;
|
||||
private InlineEditControl zHeightDisplayInfo;
|
||||
private bool HadClickOnControl;
|
||||
|
||||
public MoveInZControl(IInteractionVolumeContext context)
|
||||
: base(context)
|
||||
{
|
||||
Name = "MoveInZControl";
|
||||
zHeightDisplayInfo = new ValueDisplayInfo()
|
||||
zHeightDisplayInfo = new InlineEditControl()
|
||||
{
|
||||
ForceHide = () =>
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue