diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs index 977c5ba2..409a01fb 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacterEditorViewModel.cs @@ -223,6 +223,7 @@ namespace AideDeJeu.ViewModels set { SetProperty(ref _SelectedBackground, value); + OnPropertyChanged(nameof(PreferedBackground)); NotifySelectedBackground = new NotifyTaskCompletion(Task.Run(() => LoadBackgroundAsync(_SelectedBackground))); } } @@ -309,6 +310,7 @@ namespace AideDeJeu.ViewModels set { SetProperty(ref _SelectedSubBackground, value); + OnPropertyChanged(nameof(PreferedBackground)); NotifySelectedSubBackground = new NotifyTaskCompletion(Task.Run(() => LoadSubBackgroundAsync(SelectedSubBackground))); } } @@ -342,6 +344,14 @@ namespace AideDeJeu.ViewModels return subbackground; } + public BackgroundItem PreferedBackground + { + get + { + return SelectedSubBackground ?? SelectedBackground; + } + } + private List _PersonalityTraits = null; public List PersonalityTraits { diff --git a/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml b/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml index 053a0b42..b6995317 100644 --- a/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml +++ b/AideDeJeu/AideDeJeu/Views/ItemPickerView.xaml @@ -14,15 +14,14 @@ - - - - + + + diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml index 41346de5..e50e75a4 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacterEditorPage.xaml @@ -59,6 +59,30 @@ + + + + + + + + + + + + + + + + + + + + + + + +