diff --git a/ViewModels/ViewModelBase.cs b/ViewModels/ViewModelBase.cs index 0ac1f1d..b9b14ba 100644 --- a/ViewModels/ViewModelBase.cs +++ b/ViewModels/ViewModelBase.cs @@ -1,4 +1,5 @@ using System.Collections.ObjectModel; +using System.ComponentModel.DataAnnotations; using Avalonia.Input; using Avalonia.Media; using CommunityToolkit.Mvvm.ComponentModel; @@ -9,6 +10,9 @@ namespace SimpleDraw.ViewModels; public class ViewModelBase : ObservableObject { + public int WindowWidth { get; set; } = 1200; + public int WindowHeight { get; set; } = 800; + public ObservableCollection? ColorPalette { get; set; } public IRelayCommand? CanvasPointerPressedCommand { get; set; } public IRelayCommand? CanvasPointerMovedCommand { get; set; } @@ -26,7 +30,7 @@ public class ViewModelBase : ObservableObject get => _brush; set => SetProperty(ref _brush, value); } - + public double BrushThickness { get => _brushThickness; diff --git a/Views/MainWindow.axaml b/Views/MainWindow.axaml index 11855f6..87705a0 100644 --- a/Views/MainWindow.axaml +++ b/Views/MainWindow.axaml @@ -9,23 +9,36 @@ xmlns:i="using:Avalonia.Xaml.Interactivity" xmlns:behaviors="using:Avalonia.Xaml.Interactions.Core" xmlns:componentModel="clr-namespace:CommunityToolkit.Mvvm.ComponentModel;assembly=CommunityToolkit.Mvvm" + xmlns:system="clr-namespace:System;assembly=System.Runtime" x:DataType="vm:MainWindowViewModel" Icon="/Assets/avalonia-logo.ico" - Title="SimpleDraw"> - + Title="SimpleDraw" + Width="{Binding WindowWidth}" + Height="{Binding WindowHeight}" + MinWidth="400" + MinHeight="300" + WindowStartupLocation="CenterScreen" + > + + {0:0.#####} + + - - - - File + + + + + + - - Edit + + + @@ -33,11 +46,7 @@ - - - - - + @@ -66,10 +75,14 @@ - + + Brush Size: + + + - + - + @@ -106,6 +119,5 @@ - - + diff --git a/Views/MainWindow.axaml.cs b/Views/MainWindow.axaml.cs index bc223c1..507503d 100644 --- a/Views/MainWindow.axaml.cs +++ b/Views/MainWindow.axaml.cs @@ -1,4 +1,5 @@ using Avalonia.Controls; +using Avalonia.Input; using SimpleDraw.ViewModels; namespace SimpleDraw.Views; @@ -9,5 +10,7 @@ public partial class MainWindow : Window { InitializeComponent(); DataContext = new MainWindowViewModel(); + Topmost = true; + Topmost = false; } } \ No newline at end of file