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

Improve popover, hook up arrow direction to tour positioning logic

Browse source
This commit is contained in:
John Lewin 2018-12-12 08:40:52 -08:00
parent 8306bac352
commit 1aa0e43094
2 changed files with 74 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

46
MatterControlLib/PartPreviewWindow/Popover.cs
View file

@ -37,29 +37,57 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
public class Popover : GuiWidget
{
private IVertexSource tabShape = null;
private ArrowDirection _arrow;
public Color TagColor { get; set; }
public ArrowDirection Arrow { get; set; }
public ArrowDirection Arrow
{
get => _arrow;
set
{
_arrow = value;
tabShape = GetShape(_arrow, this.LocalBounds, this.NotchSize, this.P2);
}
}
public override void OnBoundsChanged(EventArgs e)
{
base.OnBoundsChanged(e);
Console.WriteLine("Height: " + this.Height);
// Works for left right
//tabShape = GetShape(this.Arrow, this.LocalBounds, this.NotchSize, this.LocalBounds.Top - this.P2);
// Troubleshooting top/bottom
tabShape = GetShape(this.Arrow, this.LocalBounds, this.NotchSize, this.LocalBounds.Left + 20);
tabShape = Popover.GetShape(this.Arrow, this.LocalBounds, this.NotchSize, this.P2);
}
public int P2 { get; set; }
public int NotchSize { get; set; } = 5;
public override BorderDouble Padding
{
get
{
// TODO: Work with Lars to determine why adjusted padding seems to have no effect?
var padding = base.Padding;
switch (this.Arrow)
{
case Popover.ArrowDirection.Top:
return padding.Clone(top: padding.Top + this.NotchSize);
case Popover.ArrowDirection.Bottom:
return padding.Clone(bottom: padding.Bottom + this.NotchSize);
case Popover.ArrowDirection.Left:
return padding.Clone(left: padding.Left + this.NotchSize);
//case Popover.ArrowDirection.Right:
default:
return padding.Clone(right: padding.Right + this.NotchSize);
}
}
set => base.Padding = value;
}
private static IVertexSource GetShape(ArrowDirection arrowDirection, RectangleDouble rect, double notchSize, double p2)
{
var tabShape = new VertexStorage();