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

Made fixed width and height in button factory doubles.

Browse source
This commit is contained in:
larsbrubaker 2014-08-30 13:28:13 -07:00
parent 9bbd272467
commit c9ffc3eb98
6 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ControlElements/TextImageButtonFactory.cs
View file

@ -150,8 +150,8 @@ namespace MatterHackers.MatterControl
public bool invertImageLocation = false;
public bool AllowThemeToAdjustImage = true;
FlowDirection flowDirection;
public int FixedWidth = 0;
public int FixedHeight = 40;
public double FixedWidth = 0;
public double FixedHeight = 40;
public TooltipButton GenerateTooltipButton(string label, string normalImageName = null, string hoverImageName = null, string pressedImageName = null, string disabledImageName = null)
{

6
PartPreviewWindow/ViewGcodeBasic.cs
View file

@ -350,7 +350,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void AddModelInfo(FlowLayoutWidget buttonPanel)
{
int oldWidth = textImageButtonFactory.FixedWidth;
double oldWidth = textImageButtonFactory.FixedWidth;
textImageButtonFactory.FixedWidth = 44;
FlowLayoutWidget modelInfoContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
@ -445,7 +445,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void AddLayerInfo(FlowLayoutWidget buttonPanel)
{
int oldWidth = textImageButtonFactory.FixedWidth;
double oldWidth = textImageButtonFactory.FixedWidth;
textImageButtonFactory.FixedWidth = 44;
FlowLayoutWidget layerInfoContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);
@ -469,7 +469,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
private void AddDisplayControls(FlowLayoutWidget buttonPanel)
{
int oldWidth = textImageButtonFactory.FixedWidth;
double oldWidth = textImageButtonFactory.FixedWidth;
textImageButtonFactory.FixedWidth = 44;
FlowLayoutWidget layerInfoContainer = new FlowLayoutWidget(FlowDirection.TopToBottom);

2
PrinterControls/EditLevelingSettingsWindow.cs
View file

@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
int oldHeight = textImageButtonFactory.FixedHeight;
double oldHeight = textImageButtonFactory.FixedHeight;
textImageButtonFactory.FixedHeight = 30;
// put in the movement edit controls

2
PrinterControls/EditManualMovementSpeedsWindow.cs
View file

@ -89,7 +89,7 @@ namespace MatterHackers.MatterControl
this.functionToCallOnSave = functionToCallOnSave;
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
int oldHeight = textImageButtonFactory.FixedHeight;
double oldHeight = textImageButtonFactory.FixedHeight;
textImageButtonFactory.FixedHeight = 30;
TextWidget tempTypeLabel = new TextWidget(windowTitle, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 10);

2
PrinterControls/EditTemperaturePresetsWindow.cs
View file

@ -91,7 +91,7 @@ namespace MatterHackers.MatterControl
this.functionToCallOnSave = functionToCallOnSave;
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
int oldHeight = textImageButtonFactory.FixedHeight;
double oldHeight = textImageButtonFactory.FixedHeight;
textImageButtonFactory.FixedHeight = 30;
TextWidget tempTypeLabel = new TextWidget(windowTitle, textColor: ActiveTheme.Instance.PrimaryTextColor, pointSize: 10);

3
StaticData/Translations/Master.txt
View file

@ -2564,3 +2564,6 @@ Translated:Z Can Be Negative
English:Export as X3G
Translated:Export as X3G
English:Select an Image
Translated:Select an Image