mirror of
https://github.com/Artemis-RGB/Artemis
synced 2026-11-11 19:36:28 +00:00
Workshop - Fixed uploading layouts trying to write a ZIP file to desktop
UI - Always show user icon regardless of window
This commit is contained in:
1 parent
17bd62e673
commit
6364ce3fc4
7 files changed
+30
-42
No files matched your search
@@ -2,7 +2,6 @@
|
||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||
xmlns:avalonia="clr-namespace:Material.Icons.Avalonia;assembly=Material.Icons.Avalonia"
|
||||
xmlns:windowing="clr-namespace:FluentAvalonia.UI.Windowing;assembly=FluentAvalonia"
|
||||
xmlns:profileEditor="clr-namespace:Artemis.UI.Screens.ProfileEditor"
|
||||
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
|
||||
@@ -10,12 +9,6 @@
|
||||
x:DataType="profileEditor:ProfileEditorTitleBarViewModel">
|
||||
<Grid ColumnDefinitions="*,Auto">
|
||||
<ContentControl Grid.Row="0" Grid.Column="0" Content="{CompiledBinding MenuBarViewModel}" windowing:AppWindow.AllowInteractionInTitleBar="True" HorizontalAlignment="Left" />
|
||||
<Button Grid.Column="1" Classes="title-bar-button"
|
||||
Command="{CompiledBinding ShowDebugger}"
|
||||
HorizontalAlignment="Right"
|
||||
VerticalAlignment="Top"
|
||||
windowing:AppWindow.AllowInteractionInTitleBar="True">
|
||||
<avalonia:MaterialIcon Kind="Bug" />
|
||||
</Button>
|
||||
<ContentControl Grid.Row="0" Grid.Column="1" Content="{CompiledBinding DefaultTitleBarViewModel}" HorizontalAlignment="Right" />
|
||||
</Grid>
|
||||
</UserControl>
|
||||
@@ -1,4 +1,5 @@
|
||||
using Artemis.UI.Screens.ProfileEditor.MenuBar;
|
||||
using Artemis.UI.Screens.Root;
|
||||
using Artemis.UI.Services.Interfaces;
|
||||
using Artemis.UI.Shared;
|
||||
|
||||
@@ -6,18 +7,12 @@ namespace Artemis.UI.Screens.ProfileEditor;
|
||||
|
||||
public class ProfileEditorTitleBarViewModel : ViewModelBase
|
||||
{
|
||||
private readonly IDebugService _debugService;
|
||||
|
||||
public ProfileEditorTitleBarViewModel(IDebugService debugService, MenuBarViewModel menuBarViewModel)
|
||||
public ProfileEditorTitleBarViewModel( MenuBarViewModel menuBarViewModel, DefaultTitleBarViewModel defaultTitleBarViewModel)
|
||||
{
|
||||
MenuBarViewModel = menuBarViewModel;
|
||||
_debugService = debugService;
|
||||
DefaultTitleBarViewModel = defaultTitleBarViewModel;
|
||||
}
|
||||
|
||||
public MenuBarViewModel MenuBarViewModel { get; }
|
||||
|
||||
public void ShowDebugger()
|
||||
{
|
||||
_debugService.ShowDebugger();
|
||||
}
|
||||
public DefaultTitleBarViewModel DefaultTitleBarViewModel { get; }
|
||||
}
|
||||
Reference in new issue
Block a user