DarthAffe/Artemis
1
0 Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-11-12 03:48:56 +00:00
Code Issues Releases Wiki Activity

Workshop - Fixed uploading layouts trying to write a ZIP file to desktop

Browse Source 
UI - Always show user icon regardless of window
This commit is contained in:
RobertBeekman committed 2024-01-30 22:12:57 +01:00
1 parent 17bd62e673
commit 6364ce3fc4
7 files changed
+30 -42
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/Artemis.UI/Screens/Root/DefaultTitleBarView.axaml
+11 -3
View File
@@ -8,7 +8,15 @@
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:DataType="root:DefaultTitleBarViewModel"
x:Class="Artemis.UI.Screens.Root.DefaultTitleBarView">
<Button Classes="title-bar-button" Command="{CompiledBinding ShowDebugger}" VerticalAlignment="Top" HorizontalAlignment="Right" windowing:AppWindow.AllowInteractionInTitleBar="True" >
<avalonia:MaterialIcon Kind="Bug"></avalonia:MaterialIcon>
</Button>
<StackPanel Orientation="Horizontal" VerticalAlignment="Top" HorizontalAlignment="Right" Height="42">
<ContentControl Width="28"
Height="28"
Margin="0 0 29 0"
VerticalAlignment="Center"
Content="{CompiledBinding CurrentUserViewModel}"
windowing:AppWindow.AllowInteractionInTitleBar="True" />
<Button Classes="title-bar-button" Command="{CompiledBinding ShowDebugger}" windowing:AppWindow.AllowInteractionInTitleBar="True" VerticalAlignment="Top">
<avalonia:MaterialIcon Kind="Bug"></avalonia:MaterialIcon>
</Button>
</StackPanel>
</UserControl>
src/Artemis.UI/Screens/Root/DefaultTitleBarViewModel.cs
+6 -2
View File
@@ -1,4 +1,5 @@
using Artemis.UI.Services.Interfaces;
using Artemis.UI.Screens.Workshop.CurrentUser;
using Artemis.UI.Services.Interfaces;
using Artemis.UI.Shared;
namespace Artemis.UI.Screens.Root;
@@ -7,11 +8,14 @@ public class DefaultTitleBarViewModel : ViewModelBase
{
private readonly IDebugService _debugService;
public DefaultTitleBarViewModel(IDebugService debugService)
public DefaultTitleBarViewModel(IDebugService debugService, CurrentUserViewModel currentUserViewModel)
{
_debugService = debugService;
CurrentUserViewModel = currentUserViewModel;
}
public CurrentUserViewModel CurrentUserViewModel { get; }
public void ShowDebugger()
{
_debugService.ShowDebugger();