DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-02-04 02:43:32 +00:00
Code Issues Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Robert 2025-12-13 17:11:03 +01:00
commit fdc02ec581
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Artemis.UI.Shared/Services/ProfileEditor/ProfileEditorService.cs
View File

@ -183,12 +183,11 @@ internal class ProfileEditorService : IProfileEditorService
// Activate the profile and it's mode off of the UI thread // Activate the profile and it's mode off of the UI thread
await Task.Run(() => await Task.Run(() =>
{ {
_profileService.FocusProfile = profileConfiguration;
// Activate the profile if one was provided // Activate the profile if one was provided
if (profileConfiguration != null) if (profileConfiguration != null)
{
_profileService.FocusProfile = profileConfiguration;
_profileService.ActivateProfile(profileConfiguration); _profileService.ActivateProfile(profileConfiguration);
}
// If there is no profile configuration or module, deliberately set the override to null // If there is no profile configuration or module, deliberately set the override to null
_moduleService.SetActivationOverride(profileConfiguration?.Module); _moduleService.SetActivationOverride(profileConfiguration?.Module);

2
src/Artemis.UI/Screens/ProfileEditor/ProfileEditorViewModel.cs
View File

@ -203,7 +203,7 @@ public partial class ProfileEditorViewModel : RoutableScreen<ProfileViewModelPar
/// <inheritdoc /> /// <inheritdoc />
public override async Task OnClosing(NavigationArguments args) public override async Task OnClosing(NavigationArguments args)
{ {
if (!args.Path.StartsWith("profile-editor")) if (!args.Path.StartsWith("profile"))
{ {
ProfileConfiguration = null; ProfileConfiguration = null;
await _profileEditorService.ChangeCurrentProfileConfiguration(null); await _profileEditorService.ChangeCurrentProfileConfiguration(null);

1
src/Artemis.UI/Screens/Sidebar/SidebarProfileConfigurationView.axaml
View File

@ -71,6 +71,7 @@
ColumnDefinitions="Auto,*,Auto,Auto" ColumnDefinitions="Auto,*,Auto,Auto"
Background="Transparent" Background="Transparent"
ContextFlyout="{StaticResource ProfileMenuFlyout}" ContextFlyout="{StaticResource ProfileMenuFlyout}"
PointerPressed="ProfileContainerGrid_OnPointerPressed"
Classes.flyout-open="{CompiledBinding IsOpen, Source={StaticResource ProfileMenuFlyout}}"> Classes.flyout-open="{CompiledBinding IsOpen, Source={StaticResource ProfileMenuFlyout}}">
<shared:ProfileConfigurationIcon Grid.Column="0" <shared:ProfileConfigurationIcon Grid.Column="0"
x:Name="ProfileIcon" x:Name="ProfileIcon"

9
src/Artemis.UI/Screens/Sidebar/SidebarProfileConfigurationView.axaml.cs
View File

@ -1,4 +1,5 @@
using Avalonia.Markup.Xaml; using Avalonia.Input;
using Avalonia.Markup.Xaml;
using Avalonia.ReactiveUI; using Avalonia.ReactiveUI;
namespace Artemis.UI.Screens.Sidebar; namespace Artemis.UI.Screens.Sidebar;
@ -10,4 +11,10 @@ public partial class SidebarProfileConfigurationView : ReactiveUserControl<Sideb
InitializeComponent(); InitializeComponent();
} }
private void ProfileContainerGrid_OnPointerPressed(object? sender, PointerPressedEventArgs e)
{
// When right-clicking only open the context menu, don't select the profile
if (e.GetCurrentPoint(this).Properties.IsRightButtonPressed)
e.Handled = true;
}
} }

2
src/Artemis.UI/Screens/Workshop/Entries/List/EntryListInputViewModel.cs
View File

@ -17,7 +17,7 @@ public partial class EntryListInputViewModel : ViewModelBase
public EntryListInputViewModel(ISettingsService settingsService) public EntryListInputViewModel(ISettingsService settingsService)
{ {
_search = _lastSearch; _search = _lastSearch;
_sortBy = settingsService.GetSetting("Workshop.SortBy", 10); _sortBy = settingsService.GetSetting("Workshop.SortBy", 0);
_sortBy.AutoSave = true; _sortBy.AutoSave = true;
} }