diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Resources/Brushes.axaml b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Resources/Brushes.axaml index 20a39c2..495b88e 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Resources/Brushes.axaml +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Resources/Brushes.axaml @@ -1,5 +1,4 @@ - + @@ -15,36 +14,29 @@ + - + - + - - + + - + - - + + - + \ No newline at end of file diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Resources/SolarizedDarkTheme.axaml b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Resources/SolarizedDarkTheme.axaml index 42fe1dc..8e6b009 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Resources/SolarizedDarkTheme.axaml +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Resources/SolarizedDarkTheme.axaml @@ -1,7 +1,7 @@ - + #E7073642 + #80073642 #083e4c #D0083e4c #80083e4c diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/IMainWindowViewModelBase.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/IMainWindowViewModelBase.cs index ab38973..094ec9b 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/IMainWindowViewModelBase.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/IMainWindowViewModelBase.cs @@ -1,3 +1,4 @@ +using Avalonia.Controls; using DeclarativeProperty; namespace FileTime.GuiApp.App.ViewModels; @@ -8,4 +9,5 @@ public interface IMainWindowViewModelBase bool Loading { get; } IObservable MainFont { get; } DeclarativeProperty FatalError { get; } + IReadOnlyList TransparencyLevelHint { get; } } \ No newline at end of file diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/MainWindowLoadingViewModel.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/MainWindowLoadingViewModel.cs index e4a91f8..ec6d8c4 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/MainWindowLoadingViewModel.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/MainWindowLoadingViewModel.cs @@ -1,4 +1,5 @@ using System.Reactive.Subjects; +using Avalonia.Controls; using DeclarativeProperty; namespace FileTime.GuiApp.App.ViewModels; @@ -9,4 +10,5 @@ public class MainWindowLoadingViewModel : IMainWindowViewModelBase public IObservable MainFont { get; } = new BehaviorSubject(""); public DeclarativeProperty Title { get; } = new("Loading..."); public DeclarativeProperty FatalError { get; } = new(); + public IReadOnlyList TransparencyLevelHint { get; } = new[] {WindowTransparencyLevel.AcrylicBlur}; } \ No newline at end of file diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/MainWindowViewModel.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/MainWindowViewModel.cs index 9cbaccb..de77ebd 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/MainWindowViewModel.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/MainWindowViewModel.cs @@ -1,5 +1,6 @@ using System.Reactive.Linq; using System.Reflection; +using Avalonia.Controls; using Avalonia.Input; using DeclarativeProperty; using FileTime.App.CommandPalette.Services; @@ -37,12 +38,13 @@ namespace FileTime.GuiApp.App.ViewModels; [Inject(typeof(IClipboardService), PropertyAccessModifier = AccessModifier.Public)] [Inject(typeof(IModalService), PropertyName = "_modalService")] [Inject(typeof(ITimelineViewModel), PropertyAccessModifier = AccessModifier.Public)] -[Inject(typeof(IPossibleCommandsViewModel), PropertyName = "PossibleCommands",PropertyAccessModifier = AccessModifier.Public)] +[Inject(typeof(IPossibleCommandsViewModel), PropertyName = "PossibleCommands", PropertyAccessModifier = AccessModifier.Public)] public partial class MainWindowViewModel : IMainWindowViewModel { public bool Loading => false; public IObservable MainFont => _fontService.MainFont.Select(x => x ?? ""); public DeclarativeProperty FatalError { get; } = new(); + public IReadOnlyList TransparencyLevelHint { get; } = new[] {WindowTransparencyLevel.Blur}; public IGuiAppState AppState => _appState; public DeclarativeProperty Title { get; } = new(); public Action? FocusDefaultElement { get; set; } diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml index 349196f..968c8de 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml @@ -11,7 +11,7 @@ Opened="OnWindowOpened" RequestedThemeVariant="Dark" Title="FileTime" - TransparencyLevelHint="Blur" + TransparencyLevelHint="{Binding TransparencyLevelHint}" d:DataContext="vm:MainWindowDesignViewModel" d:DesignHeight="450" d:DesignWidth="800" @@ -21,6 +21,7 @@ x:DataType="vm:IMainWindowViewModelBase" xmlns="https://github.com/avaloniaui" xmlns:appCoreModels="using:FileTime.App.Core.Models" + xmlns:converters="clr-namespace:FileTime.GuiApp.App.Converters" xmlns:corevm="using:FileTime.App.Core.ViewModels" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:i="clr-namespace:Avalonia.Xaml.Interactivity;assembly=Avalonia.Xaml.Interactivity" @@ -47,8 +48,11 @@ - - + + @@ -925,7 +929,7 @@ - +