From e8adb8fc68df7afa7e8c7ada4e183860df9bcb32 Mon Sep 17 00:00:00 2001 From: John Colvin Date: Tue, 16 Apr 2019 19:56:19 -0500 Subject: [PATCH] StateManger - remove 'AlwaysTransitionOnLoaded' hack, replace with real fix --- .../Order/QuantityMeasureControl.xaml | 4 +- src/client/spark/view/Utility/StateManager.cs | 54 +++++++++---------- 2 files changed, 26 insertions(+), 32 deletions(-) diff --git a/src/client/spark/view/Controls/Order/QuantityMeasureControl.xaml b/src/client/spark/view/Controls/Order/QuantityMeasureControl.xaml index b7066b9f3..4e4d6842e 100644 --- a/src/client/spark/view/Controls/Order/QuantityMeasureControl.xaml +++ b/src/client/spark/view/Controls/Order/QuantityMeasureControl.xaml @@ -50,7 +50,7 @@ > - + @@ -111,7 +111,7 @@ > - + diff --git a/src/client/spark/view/Utility/StateManager.cs b/src/client/spark/view/Utility/StateManager.cs index 9cdc8e970..b2ba6951d 100644 --- a/src/client/spark/view/Utility/StateManager.cs +++ b/src/client/spark/view/Utility/StateManager.cs @@ -1,5 +1,4 @@ using bts; -using mbts.utils; using mbts.ui.extensions; using mbts.ui.shell; using mbts.ui.utility; @@ -123,42 +122,37 @@ namespace mbts.ui { /// If these properties are assigned after , they will bear no effect. /// If this causes problems, should be called inside the setters. public bool AttachToMembers { get; set; } - public bool AlwaysTransitionOnLoaded { get; set; } static void _reset(StateGroupsManager state_group, FrameworkElement target, StateDefinitionCollection state_defs) { if (state_group == null) return; Disposable.dispose(ref state_group._state_definitions_hook); - if (state_defs != null) { - state_group._state_definitions_hook = ObservableAutoWrapper.connect_item_hooks(state_defs, sd => { - StateManager.GoToState(target, sd.State); - sd.StateChanged += on_state_changed; - return Disposable.Create(() => sd.StateChanged -= on_state_changed); - }); - if (state_group.AttachToMembers) { - state_group._state_definitions_hook = new CompositeDisposable( - state_group._state_definitions_hook, - ObservableAutoWrapper.connect_item_actions( - state_defs, - sd => sd.SetCurrentValue(StateDefinition.GroupProperty, state_group))); - } - if (state_group.AlwaysTransitionOnLoaded && target != null) { - target.Loaded += on_loaded; - state_group._state_definitions_hook = new CompositeDisposable(state_group._state_definitions_hook) { - unhook - }; - async void on_loaded(object sender, RoutedEventArgs e) { - // The transitions don't always stick if we switch to them immediately; doing it later the dispatcher queue seems to do the trick. - await target.Dispatcher.InvokeAsync(transition); - void transition() { - foreach (var sd in state_defs) - StateManager.GoToState(target, sd.State); - } + if (target == null || state_defs == null) + return; + state_group._state_definitions_hook = ObservableAutoWrapper.connect_item_hooks(state_defs, sd => { + int version = int.MinValue; + transition(sd.State); + sd.StateChanged += on_state_changed; + return Disposable.Create(() => sd.StateChanged -= on_state_changed); + void on_state_changed(string oldval, string newval) => transition(newval); + async void transition(string state) { + version++; + if (target.IsLoaded) + StateManager.GoToState(target, state); + else { + int v = version; + await target.LoadedAsync(); + if (v == version) + StateManager.GoToState(target, state); } - void unhook() => - target.Loaded -= on_loaded; } - void on_state_changed(string oldval, string newval) => StateManager.GoToState(target, newval); + }); + if (state_group.AttachToMembers) { + state_group._state_definitions_hook = new CompositeDisposable( + state_group._state_definitions_hook, + ObservableAutoWrapper.connect_item_actions( + state_defs, + sd => sd.SetCurrentValue(StateDefinition.GroupProperty, state_group))); } } }