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

Refactor for clarity/conformance

Browse source
This commit is contained in:
John Lewin 2018-12-13 08:37:41 -08:00
parent 99cdee6ed7
commit 7e06283c08
2 changed files with 20 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

21
MatterControlLib/PartPreviewWindow/Popover.cs
View file

@ -1,5 +1,5 @@
/*
Copyright (c) 2017, Lars Brubaker, John Lewin
Copyright (c) 2018, Lars Brubaker, John Lewin
All rights reserved.
Redistribution and use in source and binary forms, with or without
@ -38,14 +38,13 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
{
private IVertexSource tabShape = null;
public Color TagColor { get; set; }
public ArrowDirection Arrow { get; }
private Popover()
{
}
/// <summary>
/// Constructs a new Popover with the given parameters
/// </summary>
/// <param name="arrow">The arrow to use</param>
/// <param name="padding">The padding of the control, adjusted internally to account for arrow region</param>
/// <param name="notchSize">The size of the arrow notch</param>
/// <param name="p2">The arrow offset in x or y given the specified arrow</param>
public Popover(ArrowDirection arrow, BorderDouble padding, int notchSize, int p2)
{
BorderDouble adjustedPadding;
@ -75,6 +74,10 @@ namespace MatterHackers.MatterControl.PartPreviewWindow
this.P2 = p2;
}
public Color TagColor { get; set; }
public ArrowDirection Arrow { get; }
public override void OnBoundsChanged(EventArgs e)
{
base.OnBoundsChanged(e);

16
MatterControlLib/SetupWizard/TourOverlay.cs
View file

@ -122,7 +122,7 @@ namespace MatterControlLib.SetupWizard
var targetBounds = this.GetTargetBounds();
Vector2 contentPosition;
int p2;
int arrowPosition;
Popover.ArrowDirection arrow;
if (targetBounds.Right >= this.Width - content.Width - 5)
@ -134,14 +134,14 @@ namespace MatterControlLib.SetupWizard
{
// position above target, arrow down aligned right center,
contentPosition = new Vector2(left, targetBounds.Top + 1);
p2 = (int)(content.LocalBounds.Left + content.LocalBounds.Width - (targetWidget.Width / 2));
arrowPosition = (int)(content.LocalBounds.Left + content.LocalBounds.Width - (targetWidget.Width / 2));
arrow = Popover.ArrowDirection.Bottom;
}
else
{
// position left of target, arrow right aligned top center
contentPosition = new Vector2(left - 1, targetBounds.Top - content.Size.Y);
p2 = (int)(content.LocalBounds.Top - (targetWidget.Height / 2));
arrowPosition = (int)(content.LocalBounds.Top - (targetWidget.Height / 2));
arrow = Popover.ArrowDirection.Right;
}
}
@ -149,7 +149,7 @@ namespace MatterControlLib.SetupWizard
{
// position under target, arrow up aligned right center
contentPosition = new Vector2(left - content.DevicePadding.Width, targetBounds.Bottom - content.Size.Y - notchSize - 1);
p2 = (int)(content.LocalBounds.Left + content.LocalBounds.Width + content.DevicePadding.Width - (targetWidget.Width / 2));
arrowPosition = (int)(content.LocalBounds.Left + content.LocalBounds.Width + content.DevicePadding.Width - (targetWidget.Width / 2));
arrow = Popover.ArrowDirection.Top;
}
}
@ -162,11 +162,11 @@ namespace MatterControlLib.SetupWizard
if (targetWidget.Height > content.Height)
{
p2 = (int)(content.LocalBounds.Top - 20);
arrowPosition = (int)(content.LocalBounds.Top - 20);
}
else
{
p2 = (int)(content.LocalBounds.Top - (targetWidget.Height / 2));
arrowPosition = (int)(content.LocalBounds.Top - (targetWidget.Height / 2));
}
arrow = Popover.ArrowDirection.Left;
@ -175,7 +175,7 @@ namespace MatterControlLib.SetupWizard
{
// position under target, arrow up aligned left center
contentPosition = new Vector2(targetBounds.Left, targetBounds.Bottom - content.Size.Y - notchSize - 1);
p2 = (int)(content.LocalBounds.Left + (targetWidget.Width / 2));
arrowPosition = (int)(content.LocalBounds.Left + (targetWidget.Width / 2));
arrow = Popover.ArrowDirection.Top;
}
}
@ -183,7 +183,7 @@ namespace MatterControlLib.SetupWizard
// Remove the temporarily padding to the child content
content.Padding = 0;
var popover = new Popover(arrow, padding, notchSize, p2)
var popover = new Popover(arrow, padding, notchSize, p2: arrowPosition)
{
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit,