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

First pass at new menubar

Browse source
This commit is contained in:
John Lewin 2017-08-04 15:42:23 -07:00
parent b00735461f
commit 1ec80d8e62
8 changed files with 189 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ApplicationView/MainApplicationWidget.cs
View file

@ -138,7 +138,7 @@ namespace MatterHackers.MatterControl
if (!UserSettings.Instance.IsTouchScreen)
{
#if !__ANDROID__
#if false // !__ANDROID__
// The application menu bar, which is suppressed on Android
var menuRow = new ApplicationMenuRow();
container.AddChild(menuRow);

57
ApplicationView/WidescreenPanel.cs
View file

@ -30,7 +30,9 @@ either expressed or implied, of the FreeBSD Project.
using System.IO;
using System.Linq;
using MatterHackers.Agg;
using MatterHackers.Agg.PlatformAbstract;
using MatterHackers.Agg.UI;
using MatterHackers.MatterControl.ConfigurationPage;
using MatterHackers.MatterControl.DataStorage;
using MatterHackers.MatterControl.PartPreviewWindow;
using MatterHackers.MatterControl.PrintLibrary;
@ -82,8 +84,20 @@ namespace MatterHackers.MatterControl
this.AddChild(library3DViewSplitter);
var leftNav = new FlowLayoutWidget(FlowDirection.TopToBottom);
leftNav.AnchorAll();
leftNav.AddChild(new BrandMenuButton()
{
MinimumSize = new VectorMath.Vector2(0, 40),
HAnchor = HAnchor.ParentLeftRight,
VAnchor = VAnchor.FitToChildren
});
leftNav.AddChild(new PrintLibraryWidget());
// put in the left column
library3DViewSplitter.Panel1.AddChild(new PrintLibraryWidget());
library3DViewSplitter.Panel1.AddChild(leftNav);
// put in the right column
library3DViewSplitter.Panel2.AddChild(new PartPreviewContent(ApplicationController.Instance.ActivePrintItem)
@ -94,6 +108,47 @@ namespace MatterHackers.MatterControl
}
}
public class BrandMenuButton : GuiWidget
{
public BrandMenuButton()
{
var buttonView = new FlowLayoutWidget()
{
HAnchor = HAnchor.ParentLeftRight,
VAnchor = VAnchor.FitToChildren,
Margin = 8
};
buttonView.AfterDraw += (s, e) =>
{
//e.graphics2D.Render(directionArrow, buttonView.LocalBounds.Right - arrowHeight * 2 - 2, buttonView.LocalBounds.Center.y + arrowHeight / 2, ActiveTheme.Instance.SecondaryTextColor);
};
buttonView.AddChild(new ImageWidget(StaticData.Instance.LoadIcon(Path.Combine("..", "Images", "mh-logo.png"), 24, 24)));
buttonView.AddChild(new TextWidget("MatterControl 1.7", textColor: ActiveTheme.Instance.PrimaryTextColor)
{
Margin = new BorderDouble(left: 6),
VAnchor = VAnchor.ParentCenter
});
var popupButton = new PopupButton(buttonView)
{
VAnchor = VAnchor.ParentCenter,
HAnchor = HAnchor.ParentLeftRight,
Margin = 0
};
popupButton.PopupContent = new ApplicationSettingsWidget(ApplicationController.Instance.Theme.MenuButtonFactory)
{
HAnchor = HAnchor.AbsolutePosition,
VAnchor = VAnchor.FitToChildren,
Width = 500,
BackgroundColor = RGBA_Bytes.White
};
this.AddChild(popupButton);
}
}
public class UpdateNotificationMark : GuiWidget
{
public UpdateNotificationMark()