wieslawsoltes
/
PanAndZoom
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Update to Avalonia master

This commit is contained in:
Wiesław Šoltés 2022-07-26 09:14:03 +02:00
Родитель 72d4fadfe7
Коммит 814a0e40b9
11 изменённых файлов: 25 добавлений и 17 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
PanAndZoom.sln
Просмотреть файл

@ -43,6 +43,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{D83B9ECD
build\SourceLink.props = build\SourceLink.props
build\SignAssembly.props = build\SignAssembly.props
build\Avalonia.Web.Blazor.props = build\Avalonia.Web.Blazor.props
build\Avalonia.Themes.Fluent.props = build\Avalonia.Themes.Fluent.props
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "git", "git", "{10DDB443-E910-47C5-B1C1-1ED769BE9834}"

2
build/Avalonia.Desktop.props
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="0.10.14" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.999-cibuild0022403-beta" />
</ItemGroup>
</Project>

2
build/Avalonia.Diagnostics.props
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.14" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.999-cibuild0022403-beta" />
</ItemGroup>
</Project>

6
build/Avalonia.Themes.Fluent.props Normal file
Просмотреть файл

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Themes.Fluent" Version="0.10.999-cibuild0022403-beta" />
</ItemGroup>
</Project>

2
build/Avalonia.Web.Blazor.props
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia.Web.Blazor" Version="0.10.14" />
<PackageReference Include="Avalonia.Web.Blazor" Version="0.10.999-cibuild0022403-beta" />
</ItemGroup>
</Project>

2
build/Avalonia.props
Просмотреть файл

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<PackageReference Include="Avalonia" Version="0.10.14" />
<PackageReference Include="Avalonia" Version="0.10.999-cibuild0022403-beta" />
</ItemGroup>
</Project>

2
build/Base.props
Просмотреть файл

@ -1,6 +1,6 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VersionPrefix>10.14.0</VersionPrefix>
<VersionPrefix>11.0.0</VersionPrefix>
<VersionSuffix></VersionSuffix>
<Authors>Wiesław Šoltés</Authors>
<Company>Wiesław Šoltés</Company>

4
samples/AvaloniaDemo.Base/App.axaml
Просмотреть файл

@ -2,8 +2,6 @@
xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<Application.Styles>
<StyleInclude Source="avares://Avalonia.Themes.Default/DefaultTheme.xaml"/>
<StyleInclude Source="avares://Avalonia.Themes.Default/Accents/BaseLight.xaml"/>
<!-- <FluentTheme Mode="Light" /> -->
<FluentTheme Mode="Light" />
</Application.Styles>
</Application>

2
samples/AvaloniaDemo.Base/AvaloniaDemo.Base.csproj
Просмотреть файл

@ -22,8 +22,8 @@
<Import Project="..\..\build\Base.props" />
<Import Project="..\..\build\ReferenceAssemblies.props" />
<Import Project="..\..\build\Avalonia.props" />
<Import Project="..\..\build\Avalonia.Desktop.props" />
<Import Project="..\..\build\Avalonia.Diagnostics.props" />
<Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
<ItemGroup>
<ProjectReference Include="..\..\src\Avalonia.Controls.PanAndZoom\Avalonia.Controls.PanAndZoom.csproj" />

5
samples/AvaloniaDemo.Desktop/Program.cs
Просмотреть файл

@ -22,5 +22,8 @@ internal class Program
public static AppBuilder BuildAvaloniaApp()
=> AppBuilder.Configure<App>()
.UsePlatformDetect()
.With(new Win32PlatformOptions { UseCompositor = true })
.With(new X11PlatformOptions { UseCompositor = true })
.With(new AvaloniaNativePlatformOptions { UseCompositor = true })
.LogToTrace();
}
}

14
src/Avalonia.Controls.PanAndZoom/ZoomBorder.ILogicalScrollable.cs
Просмотреть файл

@ -10,11 +10,11 @@ namespace Avalonia.Controls.PanAndZoom;
/// </summary>
public partial class ZoomBorder : ILogicalScrollable
{
private Size _extent = new Size();
private Size _viewport = new Size();
private Vector _offset = new Vector();
private bool _canHorizontallyScroll = false;
private bool _canVerticallyScroll = false;
private Size _extent;
private Size _viewport;
private Vector _offset;
private bool _canHorizontallyScroll;
private bool _canVerticallyScroll;
private EventHandler? _scrollInvalidated;
/// <summary>
@ -151,7 +151,7 @@ public partial class ZoomBorder : ILogicalScrollable
bool ILogicalScrollable.IsLogicalScrollEnabled => true;
event EventHandler ILogicalScrollable.ScrollInvalidated
event EventHandler? ILogicalScrollable.ScrollInvalidated
{
add => _scrollInvalidated += value;
remove => _scrollInvalidated -= value;
@ -166,7 +166,7 @@ public partial class ZoomBorder : ILogicalScrollable
return false;
}
IControl? ILogicalScrollable.GetControlInDirection(NavigationDirection direction, IControl from)
IControl? ILogicalScrollable.GetControlInDirection(NavigationDirection direction, IControl? from)
{
return null;
}