From bc1b3875a558989a94cc7e1233cdf91128d39348 Mon Sep 17 00:00:00 2001 From: Pilzinsel64 Date: Wed, 17 Dec 2025 18:28:28 +0100 Subject: [PATCH] improvements --- Candelator.sln | 6 ------ Candelator/App.axaml | 24 ++++++++++++------------ Candelator/App.axaml.cs | 10 ++++++++-- Candelator/Views/MainView.axaml | 5 +++-- Candelator/Views/MainWindow.axaml | 2 +- 5 files changed, 24 insertions(+), 23 deletions(-) diff --git a/Candelator.sln b/Candelator.sln index 22d9e92..9cc23b4 100644 --- a/Candelator.sln +++ b/Candelator.sln @@ -9,8 +9,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Candelator.Desktop", "Cande EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Candelator.Browser", "Candelator.Browser\Candelator.Browser.csproj", "{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Candelator.iOS", "Candelator.iOS\Candelator.iOS.csproj", "{EBD9022F-BC83-4846-9A11-6F7F3772DC64}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Candelator.Android", "Candelator.Android\Candelator.Android.csproj", "{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3DA99C4E-89E3-4049-9C22-0A7EC60D83D8}" @@ -36,10 +34,6 @@ Global {1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Debug|Any CPU.Build.0 = Debug|Any CPU {1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Release|Any CPU.ActiveCfg = Release|Any CPU {1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}.Release|Any CPU.Build.0 = Release|Any CPU - {EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EBD9022F-BC83-4846-9A11-6F7F3772DC64}.Release|Any CPU.Build.0 = Release|Any CPU {7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/Candelator/App.axaml b/Candelator/App.axaml index 9972d84..c8c5ba0 100644 --- a/Candelator/App.axaml +++ b/Candelator/App.axaml @@ -1,16 +1,16 @@ - + xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" + xmlns:local="using:Candelator" + x:Class="Candelator.App" + RequestedThemeVariant="Default"> + - - - + + + - - - - + + + + \ No newline at end of file diff --git a/Candelator/App.axaml.cs b/Candelator/App.axaml.cs index 787e796..1349616 100644 --- a/Candelator/App.axaml.cs +++ b/Candelator/App.axaml.cs @@ -3,6 +3,7 @@ using Avalonia.Controls.ApplicationLifetimes; using Avalonia.Data.Core; using Avalonia.Data.Core.Plugins; using System.Linq; +using Avalonia.Layout; using Avalonia.Markup.Xaml; using Candelator.ViewModels; using Candelator.Views; @@ -25,15 +26,20 @@ public partial class App : Application DisableAvaloniaDataAnnotationValidation(); desktop.MainWindow = new MainWindow { - DataContext = new MainViewModel() + DataContext = new MainViewModel(), }; } else if (ApplicationLifetime is ISingleViewApplicationLifetime singleViewPlatform) { singleViewPlatform.MainView = new MainView { - DataContext = new MainViewModel() + DataContext = new MainViewModel(), }; + // if (false) + // { + // singleViewPlatform.MainView.VerticalAlignment = VerticalAlignment.Top; + // singleViewPlatform.MainView.MaxWidth = 400; + // } } base.OnFrameworkInitializationCompleted(); diff --git a/Candelator/Views/MainView.axaml b/Candelator/Views/MainView.axaml index f911230..6e6ca7e 100644 --- a/Candelator/Views/MainView.axaml +++ b/Candelator/Views/MainView.axaml @@ -6,7 +6,8 @@ xmlns:langRes="clr-namespace:Candelator.LangRes" mc:Ignorable="d" d:DesignWidth="400" d:DesignHeight="600" x:Class="Candelator.Views.MainView" - x:DataType="vm:MainViewModel"> + x:DataType="vm:MainViewModel" + Padding="3"> @@ -17,7 +18,7 @@ ColumnSpacing="6" RowDefinitions="Auto,Auto,Auto,Auto,Auto" Margin="3"> - + diff --git a/Candelator/Views/MainWindow.axaml b/Candelator/Views/MainWindow.axaml index e0f9ca0..09a5977 100644 --- a/Candelator/Views/MainWindow.axaml +++ b/Candelator/Views/MainWindow.axaml @@ -10,6 +10,6 @@ CanMaximize="False" Icon="/Assets/avalonia-logo.ico" Title="Candelator"> - + \ No newline at end of file