Icon status panel Linux margin

This commit is contained in:
2023-08-30 08:38:59 +02:00
parent 880180f16a
commit 8292a66eb1
3 changed files with 12 additions and 2 deletions

View File

@@ -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.Services;
using FileTime.App.Core.ViewModels; using FileTime.App.Core.ViewModels;
using FileTime.App.Core.ViewModels.Timeline; using FileTime.App.Core.ViewModels.Timeline;
@@ -21,5 +22,6 @@ public interface IMainWindowViewModel : IMainWindowViewModelBase
ITimelineViewModel TimelineViewModel { get; } ITimelineViewModel TimelineViewModel { get; }
IPossibleCommandsViewModel PossibleCommands { get; } IPossibleCommandsViewModel PossibleCommands { get; }
Action? ShowWindow { get; set; } Action? ShowWindow { get; set; }
Thickness IconStatusPanelMargin { get; }
Task RunOrOpenItem(IItemViewModel itemViewModel); Task RunOrOpenItem(IItemViewModel itemViewModel);
} }

View File

@@ -1,5 +1,7 @@
using System.Reactive.Linq; using System.Reactive.Linq;
using System.Reflection; using System.Reflection;
using System.Runtime.InteropServices;
using Avalonia;
using Avalonia.Controls; using Avalonia.Controls;
using Avalonia.Input; using Avalonia.Input;
using DeclarativeProperty; using DeclarativeProperty;
@@ -49,6 +51,7 @@ public partial class MainWindowViewModel : IMainWindowViewModel
public IReadOnlyList<WindowTransparencyLevel> TransparencyLevelHint { get; } = new[] {WindowTransparencyLevel.Blur}; public IReadOnlyList<WindowTransparencyLevel> TransparencyLevelHint { get; } = new[] {WindowTransparencyLevel.Blur};
public IGuiAppState AppState => _appState; public IGuiAppState AppState => _appState;
public DeclarativeProperty<string> Title { get; } = new(); public DeclarativeProperty<string> Title { get; } = new();
public Thickness IconStatusPanelMargin { get; private set; } = new(20, 10, 10, 10);
public Action? FocusDefaultElement { get; set; } public Action? FocusDefaultElement { get; set; }
public Action? ShowWindow { get; set; } public Action? ShowWindow { get; set; }
@@ -56,6 +59,11 @@ public partial class MainWindowViewModel : IMainWindowViewModel
{ {
_logger?.LogInformation($"Starting {nameof(MainWindowViewModel)} initialization..."); _logger?.LogInformation($"Starting {nameof(MainWindowViewModel)} initialization...");
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
IconStatusPanelMargin = new(20, 10, 160, 10);
}
var version = Assembly.GetEntryAssembly()!.GetName().Version; var version = Assembly.GetEntryAssembly()!.GetName().Version;
var versionString = "Unknown version"; var versionString = "Unknown version";
if (version != null) if (version != null)

View File

@@ -80,7 +80,7 @@
</StackPanel> </StackPanel>
<StackPanel <StackPanel
Grid.Column="1" Grid.Column="1"
Margin="20,10,160,10" Margin="{Binding IconStatusPanelMargin, Mode=OneTime}"
Orientation="Vertical"> Orientation="Vertical">
<Image <Image
Width="20" Width="20"