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

Changed RGBA_Bytes -> Color

Browse source
This commit is contained in:
Lars Brubaker 2017-10-31 11:43:25 -07:00
parent c6a3c14118
commit 8d1fecab8c
107 changed files with 495 additions and 495 deletions
Download patch file Download diff file Expand all files Collapse all files

10
PartPreviewWindow/MainTab.cs
View file

@ -41,7 +41,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
private TextWidget label;
public TabPill(string tabTitle, RGBA_Bytes textColor, string imageUrl = null)
public TabPill(string tabTitle, Color textColor, string imageUrl = null)
{
var imageWidget = new ImageWidget(new ImageBuffer(16, 16))
{
@ -69,7 +69,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
}
}
public RGBA_Bytes TextColor
public Color TextColor
{
get => label.TextColor;
set => label.TextColor = value;
@ -84,7 +84,7 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public MainTab(string tabTitle, string tabName, TabPage tabPage, string tabImageUrl = null)
: this(
new TabPill(tabTitle, new RGBA_Bytes(ActiveTheme.Instance.PrimaryTextColor, 140), tabImageUrl),
new TabPill(tabTitle, new Color(ActiveTheme.Instance.PrimaryTextColor, 140), tabImageUrl),
new TabPill(tabTitle, ActiveTheme.Instance.PrimaryTextColor, tabImageUrl),
new TabPill(tabTitle, ActiveTheme.Instance.PrimaryTextColor, tabImageUrl),
tabName,
@ -102,8 +102,8 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public int BorderWidth { get; set; } = 1;
public int borderRadius { get; set; } = 4;
private RGBA_Bytes activeTabColor = ApplicationController.Instance.Theme.SlightShade;
private RGBA_Bytes inactiveTabColor = ApplicationController.Instance.Theme.PrimaryTabFillColor;
private Color activeTabColor = ApplicationController.Instance.Theme.SlightShade;
private Color inactiveTabColor = ApplicationController.Instance.Theme.PrimaryTabFillColor;
public override void OnDraw(Graphics2D graphics2D)
{