diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-12-20 15:16:24 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-12-20 15:16:24 +0200 |
| commit | ce89ca820c6d9924981e930236bfad557d9e9d1f (patch) | |
| tree | a8febb3fd8e52f091aeb0bdfcf0b0b938efb17d3 /Software/Visual_Studio | |
| parent | 35dfed5a480f1e2316f5e4eaf5e284697679e408 (diff) | |
| parent | 6fe3839f7baceffae49be64e86f0d8ecea15f371 (diff) | |
| download | Tango-ce89ca820c6d9924981e930236bfad557d9e9d1f.tar.gz Tango-ce89ca820c6d9924981e930236bfad557d9e9d1f.zip | |
Merge branch 'software' of https://twinetfs.visualstudio.com/Tango/_git/Tango into software
Diffstat (limited to 'Software/Visual_Studio')
| -rw-r--r-- | Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Dialogs/UserInputDialogViewVM.cs | 2 | ||||
| -rw-r--r-- | Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/WindowController.cs | 9 |
2 files changed, 7 insertions, 4 deletions
diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Dialogs/UserInputDialogViewVM.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Dialogs/UserInputDialogViewVM.cs index 5c8b79127..96f1d4dd9 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Dialogs/UserInputDialogViewVM.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/Dialogs/UserInputDialogViewVM.cs @@ -57,7 +57,7 @@ namespace Tango.FSE.Procedures.Dialogs public bool IsEnum { - get { return Type.IsEnum; } + get { return Type == null? false: Type.IsEnum; } } public void SetValue(Object obj, Object value) diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/WindowController.cs b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/WindowController.cs index 03a690f68..b87fb4368 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/WindowController.cs +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Procedures/WindowController.cs @@ -103,12 +103,14 @@ namespace Tango.FSE.Procedures { if (!_isShown) { - _dialogWindow.ShowDialog(); _isShown = true; + _dialogWindow.ShowDialog(); + } else { - _dialogWindow.Visibility = Visibility.Visible; + //_dialogWindow.Visibility = Visibility.Visible; + _dialogWindow.WindowState = WindowState.Normal; } } @@ -145,7 +147,8 @@ namespace Tango.FSE.Procedures public void Hide() { - _dialogWindow.Hide(); + //_dialogWindow.Hide(); + _dialogWindow.WindowState = WindowState.Minimized; } } } |