Pilzinsel64/Candelator
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improvements

Browse Source
This commit is contained in:
Pascal
2025-12-17 18:28:28 +01:00
parent b50242c3cb
commit bc1b3875a5
5 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Candelator/App.axaml
View File

@@ -1,16 +1,16 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Candelator"
x:Class="Candelator.App"
RequestedThemeVariant="Default">
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:Candelator"
x:Class="Candelator.App"
RequestedThemeVariant="Default">
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->
<Application.DataTemplates>
<local:ViewLocator/>
</Application.DataTemplates>
<Application.DataTemplates>
<local:ViewLocator/>
</Application.DataTemplates>
<Application.Styles>
<FluentTheme />
<StyleInclude Source="avares://Pilz.UI.AvaloniaUI/Assets/Styles/EnhancedDefaults.axaml"/>
</Application.Styles>
<Application.Styles>
<FluentTheme/>
<StyleInclude Source="avares://Pilz.UI.AvaloniaUI/Assets/Styles/EnhancedDefaults.axaml"/>
</Application.Styles>
</Application>

10
Candelator/App.axaml.cs
View File

@@ -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();

5
Candelator/Views/MainView.axaml
View File

@@ -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">
<Design.DataContext>
<vm:MainViewModel/>
@@ -17,7 +18,7 @@
ColumnSpacing="6"
RowDefinitions="Auto,Auto,Auto,Auto,Auto"
Margin="3">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="Auto"/>
<ColumnDefinition Width="*"/>

2
Candelator/Views/MainWindow.axaml
View File

@@ -10,6 +10,6 @@
CanMaximize="False"
Icon="/Assets/avalonia-logo.ico"
Title="Candelator">
<views:MainView/>
</Window>