This commit is contained in:
Wiesław Šoltés 2023-05-10 09:24:50 +02:00
Родитель 344517d6e7
Коммит 8ae0afdd1e
12 изменённых файлов: 18 добавлений и 11 удалений

Просмотреть файл

@ -57,6 +57,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "props", "props", "{71C4D519
build\CommunityToolkit.Mvvm.props = build\CommunityToolkit.Mvvm.props
build\ReactiveMarbles.PropertyChanged.props = build\ReactiveMarbles.PropertyChanged.props
build\ThemeEditor.Controls.ColorPicker.props = build\ThemeEditor.Controls.ColorPicker.props
build\Avalonia.Fonts.Inter.props = build\Avalonia.Fonts.Inter.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\build\_build.csproj", "{2107A4D4-2210-414C-9FD4-CD6F2D170E7F}"

Просмотреть файл

@ -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="11.0.0-preview6" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview8" />
</ItemGroup>
</Project>

Просмотреть файл

@ -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="11.0.0-preview6" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.0-preview8" />
</ItemGroup>
</Project>

Просмотреть файл

@ -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.Fonts.Inter" Version="11.0.0-preview8" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,7 +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="11.0.0-preview6" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0-preview6" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.0-preview8" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,7 +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.Simple" Version="11.0.0-preview6" />
<PackageReference Include="Avalonia.Fonts.Inter" Version="11.0.0-preview6" />
<PackageReference Include="Avalonia.Themes.Simple" Version="11.0.0-preview8" />
</ItemGroup>
</Project>

Просмотреть файл

@ -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="11.0.0-preview6" />
<PackageReference Include="Avalonia" Version="11.0.0-preview8" />
</ItemGroup>
</Project>

Просмотреть файл

@ -2,7 +2,7 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VersionPrefix>11.0.0</VersionPrefix>
<VersionSuffix>preview6</VersionSuffix>
<VersionSuffix>preview8</VersionSuffix>
<Authors>Wiesław Šoltés</Authors>
<Company>Wiesław Šoltés</Company>
<Copyright>Copyright © Wiesław Šoltés 2023</Copyright>

Просмотреть файл

@ -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="ThemeEditor.Controls.ColorPicker" Version="11.0.0-preview6" />
<PackageReference Include="ThemeEditor.Controls.ColorPicker" Version="11.0.0-preview8" />
</ItemGroup>
</Project>

Просмотреть файл

@ -23,6 +23,8 @@
<Import Project="..\..\build\Avalonia.props" />
<Import Project="..\..\build\Avalonia.Desktop.props" />
<Import Project="..\..\build\Avalonia.Diagnostics.props" />
<Import Project="..\..\build\Avalonia.Themes.Fluent.props" />
<Import Project="..\..\build\Avalonia.Fonts.Inter.props" />
<Import Project="..\..\build\ThemeEditor.Controls.ColorPicker.props" />
<ItemGroup>

Просмотреть файл

@ -34,7 +34,7 @@
<Panel Name="Panel" Background="Transparent">
<Popup Name="Popup"
IsLightDismissEnabled="True"
PlacementMode="AnchorAndGravity"
Placement="AnchorAndGravity"
PlacementGravity="TopLeft"
PlacementAnchor="TopLeft">
<Border Background="{DynamicResource SystemAltHighColor}"

Просмотреть файл

@ -115,7 +115,7 @@ public partial class ColorsPage : UserControl
var itemsControl = this.FindControl<ItemsControl>("ItemsControl");
if (itemsControl is { })
{
itemsControl.Items = _colorResources;
itemsControl.ItemsSource = _colorResources;
}
_canUpdate = true;