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

Extract tour popover logic to dedicated type, add close button

Browse source
This commit is contained in:
John Lewin 2018-12-29 12:29:05 -08:00
parent 03bdbf51d6
commit 260fcda8a9
3 changed files with 254 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

94
MatterControlLib/SetupWizard/TourOverlay.cs
View file

@ -217,14 +217,11 @@ namespace MatterControlLib.SetupWizard
};
buttonRow.AddChild(nextButton);
var cancelButton = theme.CreateDialogButton("Done".Localize());
cancelButton.Click += (s, e) => this.Close();
buttonRow.AddChild(cancelButton);
column.Size = new Vector2(250, column.Height);
popover = this.GetPopover(column);
popover.AddChild(column);
popover = new TourPopover(column, theme, targetWidget, this.GetTargetBounds());
//popover.AddChild(column);
this.AddChild(popover);
this.Focus();
@ -232,91 +229,6 @@ namespace MatterControlLib.SetupWizard
base.OnLoad(args);
}
private Popover GetPopover(FlowLayoutWidget content)
{
int notchSize = 8;
var padding = new BorderDouble(theme.DefaultContainerPadding);
// Temporarily add the popover padding to the child content
content.Padding = padding;
// and last, set the size
var targetBounds = this.GetTargetBounds();
Vector2 contentPosition;
int arrowPosition;
Popover.ArrowDirection arrow;
if (targetBounds.Right >= this.Width - content.Width - 5)
{
var left = targetBounds.Right - content.Width;
if (targetBounds.Bottom < this.Height / 2)
{
if (targetBounds.Bottom - content.Size.Y < 0)
{
// position above target, arrow down aligned right center,
contentPosition = new Vector2(left, targetBounds.Top + 1);
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);
arrowPosition = (int)(content.LocalBounds.Top - (targetWidget.Height / 2));
arrow = Popover.ArrowDirection.Right;
}
}
else
{
// position under target, arrow up aligned right center
contentPosition = new Vector2(left - content.DevicePadding.Width, targetBounds.Bottom - content.Size.Y - notchSize - 1);
arrowPosition = (int)(content.LocalBounds.Left + content.LocalBounds.Width + content.DevicePadding.Width - (targetWidget.Width / 2));
arrow = Popover.ArrowDirection.Top;
}
}
else
{
if (targetBounds.Bottom < this.Height / 2)
{
// position right of target, arrow left aligned top center (or top 20 if target larger than content)
contentPosition = new Vector2(targetBounds.Right + 1, targetBounds.Top - content.Size.Y);
if (targetWidget.Height > content.Height)
{
arrowPosition = (int)(content.LocalBounds.Top - 20);
}
else
{
arrowPosition = (int)(content.LocalBounds.Top - (targetWidget.Height / 2));
}
arrow = Popover.ArrowDirection.Left;
}
else
{
// position under target, arrow up aligned left center
contentPosition = new Vector2(targetBounds.Left, targetBounds.Bottom - content.Size.Y - notchSize - 1);
arrowPosition = (int)(content.LocalBounds.Left + (targetWidget.Width / 2));
arrow = Popover.ArrowDirection.Top;
}
}
// Remove the temporarily padding to the child content
content.Padding = 0;
var popover = new Popover(arrow, padding, notchSize, p2: arrowPosition)
{
HAnchor = HAnchor.Fit,
VAnchor = VAnchor.Fit,
TagColor = theme.ResolveColor(theme.BackgroundColor, theme.AccentMimimalOverlay.WithAlpha(50)),
};
popover.Position = contentPosition;
return popover;
}
private RectangleDouble GetTargetBounds()
{
var childBounds = targetWidget.TransformToScreenSpace(targetWidget.LocalBounds);