4 Commits

Author SHA1 Message Date
mbabienco df11b65c05 Fix focusing and clipboard use 2026-04-08 12:54:35 +09:00
mbabienco fc963d88f7 Fix deprecations regarding Watermark 2026-04-08 12:54:28 +09:00
mbabienco 600ae58f25 Use OpenGL rendering 2026-04-08 12:54:18 +09:00
mbabienco 0783e0b544 Update packages to Avalonia 12 compatible 2026-04-08 12:54:11 +09:00
7 changed files with 25 additions and 13 deletions
+1 -1
View File
@@ -1,5 +1,5 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<AvaloniaVersion>11.3.12</AvaloniaVersion> <AvaloniaVersion>12.0.0</AvaloniaVersion>
</PropertyGroup> </PropertyGroup>
</Project> </Project>
+6 -6
View File
@@ -53,15 +53,15 @@
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" /> <PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" /> <PackageReference Include="Avalonia.Fonts.Inter" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" /> <PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"> <!-- <PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)">
<IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets> <IncludeAssets Condition="'$(Configuration)' != 'Debug'">None</IncludeAssets>
<PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets> <PrivateAssets Condition="'$(Configuration)' != 'Debug'">All</PrivateAssets>
</PackageReference> </PackageReference> -->
<PackageReference Include="PDFsharp-MigraDoc" Version="6.2.4" /> <PackageReference Include="PDFsharp-MigraDoc" Version="6.2.4" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.10.4" /> <PackageReference Include="Magick.NET-Q8-AnyCPU" Version="14.11.1" />
<PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.10.11-preview20251127001" /> <PackageReference Include="Deadpikle.AvaloniaProgressRing" Version="0.11.0" />
<PackageReference Include="DialogHost.Avalonia" Version="0.10.4" /> <PackageReference Include="DialogHost.Avalonia" Version="0.11.1" />
<PackageReference Include="Xaml.Behaviors.Interactions.DragAndDrop.DataGrid" Version="11.3.9.5" /> <PackageReference Include="Xaml.Behaviors.Interactions.DragAndDrop.DataGrid" Version="12.0.0-rc1" />
<PackageReference Include="Docnet.Core" Version="2.6.0" /> <PackageReference Include="Docnet.Core" Version="2.6.0" />
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" /> <PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
</ItemGroup> </ItemGroup>
+12 -1
View File
@@ -17,5 +17,16 @@ class Program
=> AppBuilder.Configure<App>() => AppBuilder.Configure<App>()
.UsePlatformDetect() .UsePlatformDetect()
.WithInterFont() .WithInterFont()
.LogToTrace(); .LogToTrace()
.With(new AvaloniaNativePlatformOptions
{
// https://github.com/AvaloniaUI/Avalonia/issues/20971
RenderingMode =
[
// put OpenGL first, to have higher priority over Metal
AvaloniaNativeRenderingMode.OpenGl,
AvaloniaNativeRenderingMode.Metal,
AvaloniaNativeRenderingMode.Software
]
});
} }
+1
View File
@@ -29,6 +29,7 @@ using SixLabors.ImageSharp.Processing;
using System.Reflection.Metadata.Ecma335; using System.Reflection.Metadata.Ecma335;
using Docnet.Core.Readers; using Docnet.Core.Readers;
using MigraDoc.DocumentObjectModel.Visitors; using MigraDoc.DocumentObjectModel.Visitors;
using Avalonia.Input.Platform;
namespace MayShow.ViewModels; namespace MayShow.ViewModels;
+2 -2
View File
@@ -20,12 +20,12 @@
FontSize="16" FontSize="16"
FontWeight="Bold" /> FontWeight="Bold" />
<Label Content="Title" /> <Label Content="Title" />
<TextBox Watermark="Title" <TextBox PlaceholderText="Title"
Text="{Binding ClonedFile.Title}" Text="{Binding ClonedFile.Title}"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
TextWrapping="Wrap" /> TextWrapping="Wrap" />
<Label Content="Notes" /> <Label Content="Notes" />
<TextBox Watermark="Notes" <TextBox PlaceholderText="Notes"
Text="{Binding ClonedFile.Notes}" Text="{Binding ClonedFile.Notes}"
VerticalAlignment="Stretch" VerticalAlignment="Stretch"
AcceptsReturn="True" AcceptsReturn="True"
+2 -2
View File
@@ -50,7 +50,7 @@
IsVisible="{Binding IsTitleBoxVisible}" /> IsVisible="{Binding IsTitleBoxVisible}" />
<TextBox Text="{Binding ReportTitle}" <TextBox Text="{Binding ReportTitle}"
IsVisible="{Binding IsTitleBoxVisible}" IsVisible="{Binding IsTitleBoxVisible}"
Watermark="Receipts December 2024" PlaceholderText="Receipts December 2024"
Margin="2,0,2,4" Margin="2,0,2,4"
Classes="clearButton" Classes="clearButton"
Name="TitleTextBox"> Name="TitleTextBox">
@@ -121,7 +121,7 @@
<DataGridTemplateColumn.CellEditingTemplate> <DataGridTemplateColumn.CellEditingTemplate>
<DataTemplate DataType="models:ReportFile"> <DataTemplate DataType="models:ReportFile">
<TextBox Text="{Binding Title}" <TextBox Text="{Binding Title}"
Watermark="Title" PlaceholderText="Title"
ToolTip.Tip="{Binding Title}" ToolTip.Tip="{Binding Title}"
Classes="clearButton"> Classes="clearButton">
<TextBox.KeyBindings> <TextBox.KeyBindings>
+1 -1
View File
@@ -27,7 +27,7 @@ public partial class MainView : UserControl
public void UnfocusTextbox() public void UnfocusTextbox()
{ {
var topLevel = TopLevel.GetTopLevel(this); var topLevel = TopLevel.GetTopLevel(this);
topLevel?.FocusManager?.ClearFocus(); topLevel?.FocusManager?.Focus(null);
if (DataContext is MainViewModel mvm) if (DataContext is MainViewModel mvm)
{ {
mvm?.HasUnsavedWork = true; mvm?.HasUnsavedWork = true;