From 8292a66eb10309f0e082360ef31b39fd798f9431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81d=C3=A1m=20Kov=C3=A1cs?= Date: Wed, 30 Aug 2023 08:38:59 +0200 Subject: [PATCH] Icon status panel Linux margin --- .../ViewModels/IMainWindowViewModel.cs | 4 +++- .../FileTime.GuiApp.App/ViewModels/MainWindowViewModel.cs | 8 ++++++++ .../Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/IMainWindowViewModel.cs b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/IMainWindowViewModel.cs index d20e355..bb17154 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/IMainWindowViewModel.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/IMainWindowViewModel.cs @@ -1,4 +1,5 @@ -using FileTime.App.CommandPalette.Services; +using Avalonia; +using FileTime.App.CommandPalette.Services; using FileTime.App.Core.Services; using FileTime.App.Core.ViewModels; using FileTime.App.Core.ViewModels.Timeline; @@ -21,5 +22,6 @@ public interface IMainWindowViewModel : IMainWindowViewModelBase ITimelineViewModel TimelineViewModel { get; } IPossibleCommandsViewModel PossibleCommands { get; } Action? ShowWindow { get; set; } + Thickness IconStatusPanelMargin { get; } Task RunOrOpenItem(IItemViewModel itemViewModel); } \ 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 fd982dd..544e55f 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/MainWindowViewModel.cs +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/ViewModels/MainWindowViewModel.cs @@ -1,5 +1,7 @@ using System.Reactive.Linq; using System.Reflection; +using System.Runtime.InteropServices; +using Avalonia; using Avalonia.Controls; using Avalonia.Input; using DeclarativeProperty; @@ -49,6 +51,7 @@ public partial class MainWindowViewModel : IMainWindowViewModel public IReadOnlyList TransparencyLevelHint { get; } = new[] {WindowTransparencyLevel.Blur}; public IGuiAppState AppState => _appState; public DeclarativeProperty Title { get; } = new(); + public Thickness IconStatusPanelMargin { get; private set; } = new(20, 10, 10, 10); public Action? FocusDefaultElement { get; set; } public Action? ShowWindow { get; set; } @@ -56,6 +59,11 @@ public partial class MainWindowViewModel : IMainWindowViewModel { _logger?.LogInformation($"Starting {nameof(MainWindowViewModel)} initialization..."); + if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) + { + IconStatusPanelMargin = new(20, 10, 160, 10); + } + var version = Assembly.GetEntryAssembly()!.GetName().Version; var versionString = "Unknown version"; if (version != null) diff --git a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml index 38705b1..b979686 100644 --- a/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml +++ b/src/GuiApp/Avalonia/FileTime.GuiApp.App/Views/MainWindow.axaml @@ -80,7 +80,7 @@