diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-30 19:04:18 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-08-30 19:04:18 +0300 |
| commit | 37e5138e6acac4a9b93e018087fe9c50d36c4b34 (patch) | |
| tree | 4acec95a8e5362c67f0e0fc5444c40c23791776d /Software/Visual_Studio/Tango.SharedUI/Controls | |
| parent | 3d9beda13daccac78fb05dc94d1430a0a47e9db6 (diff) | |
| download | Tango-37e5138e6acac4a9b93e018087fe9c50d36c4b34.tar.gz Tango-37e5138e6acac4a9b93e018087fe9c50d36c4b34.zip | |
Implemented machine update on PPC !!!
Need to verify update scripts...
Diffstat (limited to 'Software/Visual_Studio/Tango.SharedUI/Controls')
| -rw-r--r-- | Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs b/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs index d21a562fd..d7af7200e 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs +++ b/Software/Visual_Studio/Tango.SharedUI/Controls/NavigationControl.cs @@ -356,8 +356,10 @@ namespace Tango.SharedUI.Controls private void Navigate(NavigationElement fromElement, NavigationElement toElement) { - if (toElement == null) return; - if (toElement == fromElement) return; + if (toElement == null || toElement == fromElement) + { + _onCompleted?.Invoke(); + } if (fromElement != null) { @@ -516,7 +518,14 @@ namespace Tango.SharedUI.Controls if (element != null) { - SelectedElement = element; + if (SelectedElement == element) + { + _onCompleted?.Invoke(); + } + else + { + SelectedElement = element; + } } return element; |