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

Add support for explicit WindowSize on SetupWizards

Browse source
This commit is contained in:
jlewin 2019-03-06 18:03:38 -08:00
parent a977c181f2
commit 3f2455c9fa
3 changed files with 17 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
MatterControlLib/ConfigurationPage/PrintLeveling/ISetupWizard.cs
View file

@ -28,6 +28,7 @@ either expressed or implied, of the FreeBSD Project.
*/
using System;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl
{
@ -39,6 +40,8 @@ namespace MatterHackers.MatterControl
WizardPage GetNextPage();
Vector2 WindowSize { get; }
WizardPage CurrentPage { get; }
}
}

3
MatterControlLib/ConfigurationPage/PrintLeveling/SetupWizards/PrinterSetupWizard.cs
View file

@ -28,6 +28,7 @@ either expressed or implied, of the FreeBSD Project.
*/
using System.Collections.Generic;
using MatterHackers.VectorMath;
namespace MatterHackers.MatterControl
{
@ -47,6 +48,8 @@ namespace MatterHackers.MatterControl
public WizardPage CurrentPage => pages.Current;
public Vector2 WindowSize { get; protected set; }
public WizardPage GetNextPage()
{
// Shutdown active page

16
MatterControlLib/SetupWizard/DialogWindow.cs
View file

@ -89,6 +89,11 @@ namespace MatterHackers.MatterControl
DialogWindow wizardWindow = GetWindow(setupWizard.GetType());
wizardWindow.Title = setupWizard.WindowTitle;
if (setupWizard.WindowSize != Vector2.Zero)
{
wizardWindow.Size = setupWizard.WindowSize;
}
SetSizeAndShow(wizardWindow, setupWizard.CurrentPage);
wizardWindow.ChangeToPage(setupWizard.CurrentPage);
@ -133,16 +138,17 @@ namespace MatterHackers.MatterControl
set => base.MinimumSize = value;
}
public static void SetSizeAndShow(DialogWindow wizardWindow, DialogPage wizardPage)
public static void SetSizeAndShow(DialogWindow dialogWindow, DialogPage wizardPage)
{
if (wizardPage.WindowSize != Vector2.Zero)
if (dialogWindow.Size == Vector2.Zero
&& wizardPage.WindowSize != Vector2.Zero)
{
wizardWindow.Size = wizardPage.WindowSize;
dialogWindow.Size = wizardPage.WindowSize;
}
wizardWindow.AlwaysOnTopOfMain = wizardPage.AlwaysOnTopOfMain;
dialogWindow.AlwaysOnTopOfMain = wizardPage.AlwaysOnTopOfMain;
wizardWindow.ShowAsSystemWindow();
dialogWindow.ShowAsSystemWindow();
}
public static bool IsOpen(Type type) => allWindows.ContainsKey(type);