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

Try out temp controls in scene before move to Controls section

Browse source
This commit is contained in:
John Lewin 2017-06-16 22:39:00 -07:00
parent b3ed045478
commit 15263ed806
3 changed files with 29 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

18
ActionBar/TemperatureWidgetBase.cs
View file

@ -46,8 +46,8 @@ namespace MatterHackers.MatterControl.ActionBar
{
FixedHeight = 18 * GuiWidget.DeviceScale,
fontSize = 7,
normalFillColor = RGBA_Bytes.White,
normalTextColor = RGBA_Bytes.DarkGray,
normalFillColor = ApplicationController.Instance.Theme.TabBodyBackground,
normalTextColor = ActiveTheme.Instance.PrimaryTextColor,
};
private static RGBA_Bytes borderColor = new RGBA_Bytes(255, 255, 255);
@ -71,7 +71,7 @@ namespace MatterHackers.MatterControl.ActionBar
public TemperatureWidgetBase(string textValue)
: base(52 * GuiWidget.DeviceScale, 52 * GuiWidget.DeviceScale)
{
this.BackgroundColor = new RGBA_Bytes(255, 255, 255, 200);
this.BackgroundColor = ApplicationController.Instance.Theme.SlightShade;
this.Margin = new BorderDouble(0, 2) * GuiWidget.DeviceScale;
temperatureTypeName = new TextWidget("", pointSize: 8)
@ -80,14 +80,14 @@ namespace MatterHackers.MatterControl.ActionBar
HAnchor = HAnchor.ParentCenter,
VAnchor = VAnchor.ParentTop,
Margin = new BorderDouble(0, 3),
TextColor = ActiveTheme.Instance.SecondaryAccentColor,
TextColor = ActiveTheme.Instance.PrimaryTextColor,
Visible = false
};
this.AddChild(temperatureTypeName);
currentTempIndicator = new TextWidget(textValue, pointSize: 11)
{
TextColor = ActiveTheme.Instance.PrimaryAccentColor,
TextColor = ActiveTheme.Instance.PrimaryTextColor,
HAnchor = HAnchor.ParentCenter,
VAnchor = VAnchor.ParentCenter,
AutoExpandBoundsToText = true
@ -127,14 +127,6 @@ namespace MatterHackers.MatterControl.ActionBar
base.OnMouseLeaveBounds(mouseEvent);
}
public override void OnDraw(Graphics2D graphics2D)
{
base.OnDraw(graphics2D);
var borderRect = new RoundedRect(this.LocalBounds, 0);
graphics2D.Render(new Stroke(borderRect, borderWidth), borderColor);
}
protected virtual void SetTargetTemperature() { }
}
}