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

Hold and use reference to owning window in TourOverlay

Browse source
This commit is contained in:
John Lewin 2018-12-13 08:46:20 -08:00
parent 7e06283c08
commit 98209ba0ce
1 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
MatterControlLib/SetupWizard/TourOverlay.cs
View file

@ -44,13 +44,15 @@ namespace MatterControlLib.SetupWizard
{
private GuiWidget targetWidget;
private Popover popover;
private GuiWidget tourWindow;
private int nextSiteIndex;
private string description;
private ThemeConfig theme;
public TourOverlay(GuiWidget targetWidget, string description, ThemeConfig theme, int nextSiteIndex)
public TourOverlay(GuiWidget tourWindow, GuiWidget targetWidget, string description, ThemeConfig theme, int nextSiteIndex)
{
this.tourWindow = tourWindow;
this.nextSiteIndex = nextSiteIndex;
this.theme = theme;
this.targetWidget = targetWidget;
@ -86,9 +88,8 @@ namespace MatterControlLib.SetupWizard
var nextButton = theme.CreateDialogButton("Next".Localize());
nextButton.Click += (s, e) =>
{
var topWindow = this.TopmostParent();
this.Close();
ShowSite(topWindow, nextSiteIndex);
ShowSite(tourWindow, nextSiteIndex);
};
buttonRow.AddChild(nextButton);
}
@ -283,7 +284,7 @@ namespace MatterControlLib.SetupWizard
if (targetWidget != null)
{
var tourOverlay = new TourOverlay(targetWidget, tourSites[siteIndex].Description, ApplicationController.Instance.Theme, siteIndex + 1);
var tourOverlay = new TourOverlay(window, targetWidget, tourSites[siteIndex].Description, ApplicationController.Instance.Theme, siteIndex + 1);
window.AddChild(tourOverlay);
}
}