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

6
Candelator.sln
View File

@@ -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

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

3
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/>