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

Compute opaque theme colors, save before slice, revise icon styling

Browse source 
- Change slicing hash generation method/name
- Add ComputeFileSha1 to ApplicationController
- Issue MatterHackers/MCCentral#2307
Same color supplied for both tab and border
- Issue MatterHackers/MCCentral#2304
Have to Save file to make slicing go after change to scene
This commit is contained in:
John Lewin 2017-11-21 11:11:07 -08:00
parent 43aeca98b1
commit a3cbe6acbe
13 changed files with 86 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

13
CustomWidgets/DockingTabControl.cs
View file

@ -155,11 +155,11 @@ namespace MatterHackers.MatterControl.CustomWidgets
{
Width = PageWidth,
VAnchor = VAnchor.Stretch,
SpliterBarColor = ApplicationController.Instance.Theme.SplitterBackground,
SplitterWidth = ApplicationController.Instance.Theme.SplitterWidth,
SpliterBarColor = theme.SplitterBackground,
SplitterWidth = theme.SplitterWidth,
};
tabControl = ApplicationController.Instance.Theme.CreateTabControl();
tabControl = theme.CreateTabControl();
resizePage.AddChild(tabControl);
this.AddChild(resizePage);
@ -222,11 +222,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
MakeScrollable = false,
};
var spliterColor = ActiveTheme.Instance.PrimaryBackgroundColor;
var alpha = ApplicationController.Instance.Theme.SplitterBackground.Alpha0To1;
spliterColor.Red0To1 *= (1 - alpha);
spliterColor.Green0To1 *= (1 - alpha);
spliterColor.Blue0To1 *= (1 - alpha);
var spliterColor = theme.SplitterBackground;
var resizeContainer = new ResizeContainer(this)
{
@ -298,6 +294,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
}
}
private class DockingWindowContent : GuiWidget, IIgnoredPopupChild
{
internal DockingWindowContent(DockingTabControl dockingControl, GuiWidget child, string title)

8
CustomWidgets/SimpleButton.cs
View file

@ -165,11 +165,8 @@ namespace MatterHackers.MatterControl.CustomWidgets
public RadioIconButton(ImageBuffer icon, ThemeConfig theme)
: base(icon, theme)
{
this.BorderColor = theme.ButtonFactory.Options.NormalTextColor;
}
public Color BorderColor { get; set; } = Color.White;
public override void OnClick(MouseEventArgs mouseEvent)
{
base.OnClick(mouseEvent);
@ -190,6 +187,8 @@ namespace MatterHackers.MatterControl.CustomWidgets
UncheckAllOtherRadioButtons();
}
this.BackgroundColor = (_checked) ? theme.MinimalShade : Color.Transparent;
OnCheckStateChanged();
Invalidate();
}
@ -205,8 +204,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
{
if (this.Checked)
{
graphics2D.Rectangle(LocalBounds, this.BorderColor);
graphics2D.Rectangle(0, 0, LocalBounds.Right, 2, ActiveTheme.Instance.PrimaryAccentColor);
}
base.OnDraw(graphics2D);