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

Update

This commit is contained in:
Wiesław Šoltés 2022-08-17 12:20:25 +02:00
Родитель a0a741feb4
Коммит 36e185edf2
44 изменённых файлов: 131 добавлений и 127 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
src/Draw2D.Destop/Draw2D.Desktop.csproj
Просмотреть файл

@ -7,6 +7,7 @@
<LangVersion>latest</LangVersion>
<Nullable>disable</Nullable>
<RootNamespace>Draw2D.Desktop</RootNamespace>
<AvaloniaVersion>0.10.999-cibuild0023228-beta</AvaloniaVersion>
</PropertyGroup>
<ItemGroup>
@ -15,7 +16,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
</ItemGroup>
<ItemGroup>

1
src/Draw2D.Destop/Program.cs
Просмотреть файл

@ -37,7 +37,6 @@ namespace Draw2D.Desktop
{
return new Win32PlatformOptions
{
EnableMultitouch = true,
AllowEglInitialization = true,
UseDeferredRendering = true
};

3
src/Draw2D.Web/Draw2D.Web.csproj
Просмотреть файл

@ -7,6 +7,7 @@
<EmccTotalMemory>16777216</EmccTotalMemory>
<BlazorEnableTimeZoneSupport>false</BlazorEnableTimeZoneSupport>
<BlazorWebAssemblyPreserveCollationData>false</BlazorWebAssemblyPreserveCollationData>
<AvaloniaVersion>0.10.999-cibuild0023228-beta</AvaloniaVersion>
</PropertyGroup>
<!-- In debug, make builds faster by reducing optimizations -->
@ -57,7 +58,7 @@
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all" />
<PackageReference Include="Avalonia.Web.Blazor" Version="0.10.12" />
<PackageReference Include="Avalonia.Web.Blazor" Version="$(AvaloniaVersion)" />
</ItemGroup>
<ItemGroup>

15
src/Draw2D/Draw2D.csproj
Просмотреть файл

@ -7,6 +7,7 @@
<LangVersion>latest</LangVersion>
<Nullable>disable</Nullable>
<RootNamespace>Draw2D</RootNamespace>
<AvaloniaVersion>0.10.999-cibuild0023228-beta</AvaloniaVersion>
</PropertyGroup>
<ItemGroup>
@ -16,15 +17,15 @@
<ItemGroup>
<PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" />
<PackageReference Include="Math.Spatial" Version="1.3.0" />
<PackageReference Include="SkiaSharp" Version="2.88.0-preview.178" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.0-preview.178" />
<PackageReference Include="SkiaSharp" Version="2.88.1-preview.108" />
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.1-preview.108" />
<PackageReference Include="Svg.Skia" Version="0.5.12" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="Avalonia" Version="0.10.12" />
<PackageReference Include="Avalonia.Skia" Version="0.10.12" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="0.10.12" />
<PackageReference Include="Avalonia.Desktop" Version="0.10.12" />
<PackageReference Include="Avalonia.Diagnostics" Version="0.10.12" />
<PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Skia" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Controls.DataGrid" Version="$(AvaloniaVersion)" />
<PackageReference Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
</ItemGroup>
</Project>

10
src/Draw2D/ViewModels/Editor/Presenters/AvaloniaContainerPresenter.cs
Просмотреть файл

@ -2,6 +2,7 @@
using Avalonia;
using Avalonia.Media;
using Avalonia.Media.Imaging;
using Avalonia.Platform;
using Avalonia.Skia;
using Draw2D.ViewModels.Containers;
using Draw2D.ViewModels.Tools;
@ -62,9 +63,14 @@ namespace Draw2D.Presenters
}
using var drawingContextImpl = _renderTarget.CreateDrawingContext(null);
var skiaDrawingContextImpl = drawingContextImpl as ISkiaDrawingContextImpl;
var leaseFeature = drawingContextImpl.GetFeature<ISkiaSharpApiLeaseFeature>();
if (leaseFeature is null)
{
return;
}
using var lease = leaseFeature.Lease();
if (skiaDrawingContextImpl?.SkCanvas is { } skCanvas)
if (lease?.SkCanvas is { } skCanvas)
{
var skMatrix = SKMatrix.CreateScale((float)(1.0 / renderScaling), (float)(1.0 / renderScaling));

4
src/Draw2D/Views/Containers/CanvasContainerView.axaml
Просмотреть файл

@ -19,11 +19,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Shapes">
<ListBox x:Name="shapes" Classes="default" Items="{Binding Shapes}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Containers/DocumentContainerView.axaml
Просмотреть файл

@ -19,11 +19,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Views">
<ListBox Classes="default" Items="{Binding ContainerViews}" SelectedItem="{Binding ContainerView}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding Title}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Containers/GroupLibraryView.axaml
Просмотреть файл

@ -9,11 +9,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Groups">
<ListBox x:Name="groups" Classes="default" Items="{Binding Items}" SelectedItem="{Binding CurrentItem}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding Title}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
<!--
<DataGrid x:Name="groups" Items="{Binding Items}" SelectedItem="{Binding CurrentItem}">

4
src/Draw2D/Views/Containers/SelectionStateView.axaml
Просмотреть файл

@ -17,11 +17,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Shapes">
<ListBox x:Name="shapes" Classes="default" Items="{Binding Shapes, Mode=OneWay}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Containers/StyleLibraryView.axaml
Просмотреть файл

@ -9,11 +9,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Styles">
<ListBox x:Name="styles" Classes="default" Items="{Binding Items}" SelectedItem="{Binding CurrentItem}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding Title}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
<!--
<DataGrid x:Name="styles" Items="{Binding Items}" SelectedItem="{Binding CurrentItem}">

8
src/Draw2D/Views/ContainersView.axaml
Просмотреть файл

@ -44,7 +44,7 @@
<Setter Property="Fill" Value="{DynamicResource SystemAccentColorLight1}" />
</Style>
</TabStrip.Styles>
<TabStrip.DataTemplates>
<TabStrip.ItemTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal" Margin="4,0,4,0" Spacing="2">
<StackPanel Orientation="Horizontal" Margin="2">
@ -58,11 +58,11 @@
</Button>
</StackPanel>
</DataTemplate>
</TabStrip.DataTemplates>
</TabStrip.ItemTemplate>
</TabStrip>
<Carousel Items="{Binding DocumentContainer.ContainerViews}"
SelectedItem="{Binding DocumentContainer.ContainerView, Mode=TwoWay}" IsVirtualized="False">
<Carousel.DataTemplates>
<Carousel.ItemTemplate>
<DataTemplate>
<Border Classes="background">
<Border Classes="zoom">
@ -174,7 +174,7 @@
</Border>
</Border>
</DataTemplate>
</Carousel.DataTemplates>
</Carousel.ItemTemplate>
</Carousel>
</DockPanel>
</UserControl>

16
src/Draw2D/Views/MainView.axaml
Просмотреть файл

@ -36,11 +36,11 @@
<ComboBox Classes="default" Grid.Row="0" Items="{Binding DocumentContainer.StyleLibrary.Items}"
SelectedItem="{Binding DocumentContainer.StyleLibrary.CurrentItem, Mode=TwoWay}"
IsVisible="{Binding !!DocumentContainer.StyleLibrary.CurrentItem}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding DocumentContainer.StyleLibrary.CurrentItem}" />
</Grid>
@ -50,11 +50,11 @@
<ComboBox Classes="default" Grid.Row="0" Items="{Binding DocumentContainer.GroupLibrary.Items}"
SelectedItem="{Binding DocumentContainer.GroupLibrary.CurrentItem, Mode=TwoWay}"
IsVisible="{Binding !!DocumentContainer.GroupLibrary.CurrentItem}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding DocumentContainer.GroupLibrary.CurrentItemm}" />
</Grid>
@ -74,11 +74,11 @@
</TabItem>
<TabItem Classes="default" Header="Tools">
<ListBox Classes="default" Items="{Binding Tools}" SelectedItem="{Binding CurrentTool}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding Title}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
</TabControl>
@ -98,11 +98,11 @@
<TabItem Classes="default" Header="Views">
<ListBox Classes="default" Items="{Binding ContainerViews}" SelectedItem="{Binding ContainerView}"
DataContext="{Binding DocumentContainer}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding Title}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Groups">

4
src/Draw2D/Views/Shapes/ArcShapeView.axaml
Просмотреть файл

@ -33,11 +33,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Shapes/CircleShapeView.axaml
Просмотреть файл

@ -29,11 +29,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Shapes/ConicShapeView.axaml
Просмотреть файл

@ -34,11 +34,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Shapes/CubicBezierShapeView.axaml
Просмотреть файл

@ -35,11 +35,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Shapes/FigureShapeView.axaml
Просмотреть файл

@ -25,11 +25,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Shapes">
<ListBox x:Name="shapes" Classes="default" Items="{Binding Shapes}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

8
src/Draw2D/Views/Shapes/GroupShapeView.axaml
Просмотреть файл

@ -23,11 +23,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Shapes">
<ListBox x:Name="shapes" Classes="default" Items="{Binding Shapes}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">
@ -39,11 +39,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Shapes/ImageShapeView.axaml
Просмотреть файл

@ -34,11 +34,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Shapes/LineShapeView.axaml
Просмотреть файл

@ -29,11 +29,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Shapes/OvalShapeView.axaml
Просмотреть файл

@ -29,11 +29,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

8
src/Draw2D/Views/Shapes/PathShapeView.axaml
Просмотреть файл

@ -28,11 +28,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Shapes">
<ListBox x:Name="shapes" Classes="default" Items="{Binding Shapes}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">
@ -44,11 +44,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Shapes/QuadraticBezierShapeView.axaml
Просмотреть файл

@ -32,11 +32,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Shapes/RectangleShapeView.axaml
Просмотреть файл

@ -33,11 +33,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Shapes/ReferenceShapeView.axaml
Просмотреть файл

@ -27,11 +27,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Shapes/TextShapeView.axaml
Просмотреть файл

@ -29,11 +29,11 @@
<TabControl Classes="default" TabStripPlacement="Top">
<TabItem Classes="default" Header="Points">
<ListBox x:Name="points" Classes="default" Items="{Binding Points}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
<TabItem Classes="default" Header="Selected">

4
src/Draw2D/Views/Tools/ArcToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/CircleToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/ConicToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/CubicBezierToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/LineToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/MoveToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/NoneToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/OvalToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

8
src/Draw2D/Views/Tools/PathToolSettingsView.axaml
Просмотреть файл

@ -24,11 +24,11 @@
<TextBlock Classes="default" Grid.Column="0" Grid.Row="5" Text="CurrentTool" />
<ComboBox Classes="default" Grid.Column="1" Grid.Row="5" Items="{Binding Tools}"
SelectedItem="{Binding CurrentTool, Mode=OneWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
</Grid>
</ScrollViewer>
@ -43,11 +43,11 @@
</TabItem>
<TabItem Classes="default" Header="Tools">
<ListBox Classes="default" Items="{Binding Tools}" SelectedItem="{Binding CurrentTool}">
<ListBox.DataTemplates>
<ListBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="list" Text="{Binding Title}" />
</DataTemplate>
</ListBox.DataTemplates>
</ListBox.ItemTemplate>
</ListBox>
</TabItem>
</TabControl>

4
src/Draw2D/Views/Tools/PathToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/PointToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/PolyLineToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/QuadraticBezierToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/RectangleToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/ScribbleToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/SelectionToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

4
src/Draw2D/Views/Tools/TextToolView.axaml
Просмотреть файл

@ -15,11 +15,11 @@
<Grid RowDefinitions="Auto,*" IsVisible="{Binding !!Filters.Count}">
<ComboBox Classes="default" Grid.Row="0" x:Name="filters" Items="{Binding Filters}"
SelectedItem="{Binding CurrentFilter, Mode=TwoWay}">
<ComboBox.DataTemplates>
<ComboBox.ItemTemplate>
<DataTemplate>
<TextBlock Classes="default" Text="{Binding Title}" />
</DataTemplate>
</ComboBox.DataTemplates>
</ComboBox.ItemTemplate>
</ComboBox>
<ContentControl Grid.Row="1" Content="{Binding CurrentFilter.Settings}" />
</Grid>

46
src/Draw2D/Zoom/ZoomControl.cs
Просмотреть файл

@ -531,39 +531,35 @@ namespace Core2D.UI.Zoom
protected override void OnAttachedToVisualTree(VisualTreeAttachmentEventArgs e)
{
base.OnAttachedToVisualTree(e);
var md = (this.GetVisualRoot() as IInputRoot)?.MouseDevice;
if (md != null)
this.Capture = () =>
{
this.Capture = () =>
{
#if DEBUG_POINTER_EVENTS
System.Diagnostics.Debug.WriteLine($"[Capture] {_isCaptured}");
System.Diagnostics.Debug.WriteLine($"[Capture] {_isCaptured}");
#endif
_isCaptured = true;
};
_isCaptured = true;
};
this.Release = () =>
{
this.Release = () =>
{
#if DEBUG_POINTER_EVENTS
System.Diagnostics.Debug.WriteLine($"[Release] {_isCaptured}");
System.Diagnostics.Debug.WriteLine($"[Release] {_isCaptured}");
#endif
_isCaptured = false;
};
_isCaptured = false;
};
this.IsCaptured = () =>
{
this.IsCaptured = () =>
{
#if DEBUG_POINTER_EVENTS
System.Diagnostics.Debug.WriteLine($"[IsCaptured] {_isCaptured}");
System.Diagnostics.Debug.WriteLine($"[IsCaptured] {_isCaptured}");
#endif
return _isCaptured;
};
return _isCaptured;
};
this.Redraw = () =>
{
this.InvalidateVisual();
};
}
this.Redraw = () =>
{
this.InvalidateVisual();
};
if (_inputTarget != null && _drawTarget != null)
{
@ -583,9 +579,9 @@ namespace Core2D.UI.Zoom
}
}
protected override void OnPointerEnter(PointerEventArgs e)
protected override void OnPointerEntered(PointerEventArgs e)
{
base.OnPointerEnter(e);
base.OnPointerEntered(e);
this.Focus();
}