Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Exmaple2.0/App.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
</Application.DataTemplates>

<Application.Styles>
<SimpleTheme></SimpleTheme>
<SimpleTheme />
<StyleInclude Source="avares://MsBox.Avalonia.Markdown/Controls/MarkdownView.axaml" />
</Application.Styles>

Expand Down
4 changes: 4 additions & 0 deletions Exmaple2.0/App.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ public partial class App : Application
public override void Initialize()
{
AvaloniaXamlLoader.Load(this);
//Uncomment these lines to use the new Dev Tools (part of Avalonia Plus or higher).
//#if DEBUG
// this.AttachDeveloperTools();
//#endif
}

public override void OnFrameworkInitializationCompleted()
Expand Down
10 changes: 5 additions & 5 deletions Exmaple2.0/Exmaple2.0.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia" Version="11.1.5" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.1.5" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.1.5" />
<PackageReference Include="Avalonia.Desktop" Version="11.1.5" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.0" />
<PackageReference Include="Avalonia" Version="12.0.1" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="12.0.1" />
<PackageReference Include="Avalonia.Desktop" Version="12.0.1" />
<PackageReference Include="Avalonia.Themes.Simple" Version="12.0.1" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 0 additions & 4 deletions Exmaple2.0/Views/MainWindow.axaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,6 @@ public partial class MainWindow : Window
public MainWindow()
{
InitializeComponent();
#if DEBUG
this.AttachDevTools();

#endif
}

private async void Standard_Show_OnClick(object sender, RoutedEventArgs e)
Expand Down
8 changes: 4 additions & 4 deletions MsBox.Avalonia.Markdown/MsBox.Avalonia.Markdown.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageVersion>3.2.0.0</PackageVersion>
<PackageVersion>4.0.0.0</PackageVersion>
<Title>MessageBox.Avalonia.Markdown</Title>
<Authors>Lary</Authors>
<Description>Mardkown support for Messagebox AvaloniaUI</Description>
Expand All @@ -10,7 +10,7 @@
<RepositoryUrl>messagebox.avalonia</RepositoryUrl>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageTags>Avalonia MessageBox Markdown</PackageTags>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand All @@ -28,7 +28,7 @@
<AvaloniaResource Include="Assets\*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Markdown.Avalonia" Version="11.0.2" />
<PackageReference Include="Markdown.Avalonia" Version="12.0.0-a3" />
</ItemGroup>
<ItemGroup>
<None Update="..\MsBox.Avalonia\icon.jpg">
Expand Down
3 changes: 2 additions & 1 deletion MsBox.Avalonia/Controls/MsBoxCustomView.axaml.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using Avalonia.Controls;
using Avalonia.Input.Platform;
using Avalonia.LogicalTree;
using Avalonia.Threading;

Expand Down Expand Up @@ -50,7 +51,7 @@ public Task Copy()
{
text = (DataContext as AbstractMsBoxViewModel)?.ContentMessage;
}
return clipboard?.SetTextAsync(text);
return ClipboardExtensions.SetTextAsync(clipboard, text);
}

public void Close()
Expand Down
3 changes: 2 additions & 1 deletion MsBox.Avalonia/Controls/MsBoxStandardView.axaml.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Avalonia;
using Avalonia.Controls;
using Avalonia.Controls.Templates;
using Avalonia.Input.Platform;
using Avalonia.LogicalTree;
using Avalonia.Threading;

Expand Down Expand Up @@ -62,7 +63,7 @@ public Task Copy()
{
text = (DataContext as AbstractMsBoxViewModel)?.ContentMessage;
}
return clipboard?.SetTextAsync(text);
return ClipboardExtensions.SetTextAsync(clipboard, text);
}

public void Close()
Expand Down
2 changes: 1 addition & 1 deletion MsBox.Avalonia/Dto/AbstractMessageBoxParams.cs
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public abstract class AbstractMessageBoxParams
/// <summary>
/// Determines system decorations (title bar, border, etc)
/// </summary>
public SystemDecorations SystemDecorations { get; set; } = SystemDecorations.Full;
public WindowDecorations WindowDecorations { get; set; } = WindowDecorations.Full;

/// <summary>
/// Window under all windows
Expand Down
10 changes: 5 additions & 5 deletions MsBox.Avalonia/MsBox.Avalonia.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageVersion>3.3.1.1</PackageVersion>
<PackageVersion>4.0.0.0</PackageVersion>
<Title>MessageBox.Avalonia</Title>
<Authors>Lary</Authors>
<Description>Messagebox for AvaloniaUI</Description>
Expand All @@ -10,7 +10,7 @@
<RepositoryUrl>messagebox.avalonia</RepositoryUrl>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<PackageTags>Avalonia MessageBox</PackageTags>
<TargetFramework>netstandard2.0</TargetFramework>
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
<LangVersion>latest</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
Expand All @@ -28,8 +28,8 @@
<AvaloniaResource Include="Assets\*" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.1.5" />
<PackageReference Include="DialogHost.Avalonia" Version="0.8.1" />
<PackageReference Include="Avalonia" Version="12.0.1" />
<PackageReference Include="DialogHost.Avalonia" Version="0.12.0" />
</ItemGroup>
<ItemGroup>
<None Update="icon.jpg">
Expand Down
4 changes: 2 additions & 2 deletions MsBox.Avalonia/ViewModels/AbstractMsBoxViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ protected AbstractMsBoxViewModel(AbstractMessageBoxParams @params, Icon icon = I
WindowIconPath = @params.WindowIcon;
SizeToContent = @params.SizeToContent;
LocationOfMyWindow = @params.WindowStartupLocation;
SystemDecorations = @params.SystemDecorations;
WindowDecorations = @params.WindowDecorations;
Topmost = @params.Topmost;
CloseOnClickAway = @params.CloseOnClickAway;

Expand Down Expand Up @@ -87,7 +87,7 @@ protected AbstractMsBoxViewModel(AbstractMessageBoxParams @params, Icon icon = I
public double MaxHeight { get; set; }
public double Height { get; set; }

public SystemDecorations SystemDecorations { get; set; }
public WindowDecorations WindowDecorations { get; set; }
public bool Topmost { get; set; }

public SizeToContent SizeToContent { get; set; } = SizeToContent.Height;
Expand Down
2 changes: 1 addition & 1 deletion MsBox.Avalonia/Windows/MsBoxWindow.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
x:Class="MsBox.Avalonia.Windows.MsBoxWindow"
SizeToContent="WidthAndHeight"
x:DataType="viewModels:AbstractMsBoxViewModel"
SystemDecorations="{Binding SystemDecorations}"
WindowDecorations="{Binding WindowDecorations}"
Topmost="{Binding Topmost}"
Icon="{Binding WindowIconPath}"
WindowStartupLocation="{Binding LocationOfMyWindow}"
Expand Down