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

Stylistic exploration.

Browse source
This commit is contained in:
kevinepope 2014-03-01 18:48:25 -08:00
parent caa4da6dc6
commit 92096291bc
4 changed files with 48 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ConfigurationPage/ConfigurationPage.cs
View file

@ -285,7 +285,7 @@ namespace MatterHackers.MatterControl
private void SetDisplayAttributes()
{
this.BackgroundColor = ActiveTheme.Instance.PrimaryAccentColor;
this.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
this.textImageButtonFactory.normalFillColor = RGBA_Bytes.White;
this.textImageButtonFactory.disabledFillColor = RGBA_Bytes.White;

2
CustomWidgets/DisableableWidget.cs
View file

@ -26,7 +26,7 @@ namespace MatterHackers.MatterControl.CustomWidgets
public void SetEnableLevel(EnableLevel enabledLevel)
{
disableOverlay.BackgroundColor = new RGBA_Bytes(ActiveTheme.Instance.PrimaryAccentColor, 160);
disableOverlay.BackgroundColor = new RGBA_Bytes(ActiveTheme.Instance.PrimaryBackgroundColor, 160);
switch (enabledLevel)
{
case EnableLevel.Disabled:

2
PrinterControls/ManualPrinterControls.cs
View file

@ -689,7 +689,7 @@ namespace MatterHackers.MatterControl
private void SetDisplayAttributes()
{
this.BackgroundColor = ActiveTheme.Instance.PrimaryAccentColor;
this.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
this.textImageButtonFactory.normalFillColor = RGBA_Bytes.White;
this.textImageButtonFactory.disabledFillColor = RGBA_Bytes.White;

53
WidescreenPanel.cs
View file

@ -49,7 +49,7 @@ using MatterHackers.Localizations;
using MatterHackers.MatterControl.PartPreviewWindow;
namespace MatterHackers.MatterControl
{
{
public class WidescreenPanel : FlowLayoutWidget
{
static WidescreenPanel globalInstance;
@ -70,6 +70,9 @@ namespace MatterHackers.MatterControl
View3DTransformPart part3DView;
GcodeViewBasic partGcodeView;
GuiWidget RightBorderLine;
GuiWidget LeftBorderLine;
public WidescreenPanel()
: base(FlowDirection.LeftToRight)
{
@ -77,7 +80,8 @@ namespace MatterHackers.MatterControl
{
//PrintQueueControl.Instance.Initialize();
BackgroundColor = RGBA_Bytes.Gray;
BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
Padding = new BorderDouble(4);
ColumnOne = new FlowLayoutWidget(FlowDirection.TopToBottom);
ColumnTwo = new FlowLayoutWidget(FlowDirection.TopToBottom);
@ -89,10 +93,12 @@ namespace MatterHackers.MatterControl
ColumnOne.AddChild(new QueueTab());
ColumnOne.Width = 480; //Ordering here matters - must go after children are added
ColumnOne.Padding = new BorderDouble(4);
ColumnTwo.Padding = new BorderDouble(4);
ColumnThree.Padding = new BorderDouble(4);
//ColumnOne.Padding = new BorderDouble(4);
//ColumnTwo.Padding = new BorderDouble(4, 0);
//ColumnThree.Padding = new BorderDouble(4);
LeftBorderLine = CreateBorderLine();
RightBorderLine = CreateBorderLine();
LoadColumnTwo();
@ -106,7 +112,9 @@ namespace MatterHackers.MatterControl
}
AddChild(ColumnOne);
AddChild(LeftBorderLine);
AddChild(ColumnTwo);
AddChild(RightBorderLine);
AddChild(ColumnThree);
}
@ -116,6 +124,15 @@ namespace MatterHackers.MatterControl
}
private static GuiWidget CreateBorderLine()
{
GuiWidget topLine = new GuiWidget(3, 1);
topLine.BackgroundColor = new RGBA_Bytes(200,200,200);
topLine.VAnchor = VAnchor.ParentBottomTop;
topLine.Margin = new BorderDouble(8, 0);
return topLine;
}
void onBoundsChanges(Object sender, EventArgs e)
{
SetVisibleStatus();
@ -188,7 +205,7 @@ namespace MatterHackers.MatterControl
TabControl CreateNewAdvancedControlsTab(SliceSettingsWidget.UiState sliceSettingsUiState)
{
advancedControls = new TabControl();
advancedControls.BackgroundColor = ActiveTheme.Instance.PrimaryAccentColor;
advancedControls.BackgroundColor = ActiveTheme.Instance.PrimaryBackgroundColor;
advancedControls.TabBar.BorderColor = RGBA_Bytes.White;
advancedControls.TabBar.Margin = new BorderDouble(0, 0);
advancedControls.TabBar.Padding = new BorderDouble(0, 2);
@ -258,33 +275,53 @@ namespace MatterHackers.MatterControl
ColumnThree.Visible = false;
ColumnTwo.Visible = false;
ColumnOne.RemoveAllChildren();
ColumnOne.AddChild(new ActionBarPlus());
ColumnOne.AddChild(new MainSlide());
ColumnOne.AnchorAll();
ColumnOne.Visible = true;
LeftBorderLine.Visible = false;
RightBorderLine.Visible = false;
}
else if (this.Width < ColumnTwoMinWidth)
{
ColumnThree.Visible = true;
ColumnTwo.Visible = false;
ColumnOne.RemoveAllChildren();
ColumnOne.AddChild(new ActionBarPlus());
ColumnOne.AddChild(new PrintProgressBar());
ColumnOne.AddChild(new QueueTab());
ColumnOne.AnchorAll();
ColumnOne.Visible = true;
LeftBorderLine.Visible = true;
RightBorderLine.Visible = false;
}
else
{
ColumnThree.Visible = true;
ColumnTwo.Visible = true;
ColumnOne.RemoveAllChildren();
ColumnOne.AddChild(new ActionBarPlus());
ColumnOne.AddChild(new PrintProgressBar());
ColumnOne.AddChild(new QueueTab());
ColumnOne.HAnchor = Agg.UI.HAnchor.None;
ColumnOne.Width = 480;
ColumnOne.Visible = true;
LeftBorderLine.Visible = true;
RightBorderLine.Visible = true;
}
}
private void onThemeChanged(object sender, EventArgs e)
{
this.advancedControls.BackgroundColor = ActiveTheme.Instance.PrimaryAccentColor;
//this.advancedControls.BackgroundColor = ActiveTheme.Instance.PrimaryAccentColor;
this.advancedControls.Invalidate();
}