1berry/PixiEditor
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added color picker as submodule

Browse Source
This commit is contained in:
Krzysztof Krysiński 2025-03-05 10:29:28 +01:00
parent 1e4f7a367e
commit 52ab401c79
7 changed files with 70 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -7,3 +7,6 @@
[submodule "src/Drawie"] [submodule "src/Drawie"]
path = src/Drawie path = src/Drawie
url = https://github.com/PixiEditor/Drawie.git url = https://github.com/PixiEditor/Drawie.git
[submodule "src/ColorPicker"]
path = src/ColorPicker
url = https://github.com/PixiEditor/ColorPicker.git

2
src/Directory.Build.props
View File

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<CodeAnalysisRuleSet>../Custom.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>../Custom.ruleset</CodeAnalysisRuleSet>
<AvaloniaVersion>11.2.4</AvaloniaVersion> <AvaloniaVersion>11.2.5</AvaloniaVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />

2
src/PixiDocks

@ -1 +1 @@
Subproject commit 261d8e70227a68d6bc76883af4d1f76b2e6f467d Subproject commit 71c3120eda7a644c7da88885504a9e30de68161d

62
src/PixiEditor.sln
View File

@ -132,6 +132,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia.Cor
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.UpdateInstaller.Exe", "PixiEditor.UpdateInstaller.Exe\PixiEditor.UpdateInstaller.Exe.csproj", "{0258658B-78D5-4790-AF27-94B065DF529C}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.UpdateInstaller.Exe", "PixiEditor.UpdateInstaller.Exe\PixiEditor.UpdateInstaller.Exe.csproj", "{0258658B-78D5-4790-AF27-94B065DF529C}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorPicker.AvaloniaUI", "ColorPicker\src\ColorPicker.AvaloniaUI\ColorPicker.AvaloniaUI.csproj", "{885A99AB-86F0-4D8E-A989-FB0000C1662D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ColorPicker.Models", "ColorPicker\src\ColorPicker.Models\ColorPicker.Models.csproj", "{ED673353-3433-4FCB-9199-0F8DE0968F52}"
EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64 Debug|x64 = Debug|x64
@ -1256,6 +1260,62 @@ Global
{0258658B-78D5-4790-AF27-94B065DF529C}.Steam|x64.Build.0 = Debug|Any CPU {0258658B-78D5-4790-AF27-94B065DF529C}.Steam|x64.Build.0 = Debug|Any CPU
{0258658B-78D5-4790-AF27-94B065DF529C}.Steam|ARM64.ActiveCfg = Debug|Any CPU {0258658B-78D5-4790-AF27-94B065DF529C}.Steam|ARM64.ActiveCfg = Debug|Any CPU
{0258658B-78D5-4790-AF27-94B065DF529C}.Steam|ARM64.Build.0 = Debug|Any CPU {0258658B-78D5-4790-AF27-94B065DF529C}.Steam|ARM64.Build.0 = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.Debug|x64.ActiveCfg = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.Debug|x64.Build.0 = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.Debug|ARM64.Build.0 = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.DevRelease|x64.ActiveCfg = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.DevRelease|x64.Build.0 = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.DevRelease|ARM64.Build.0 = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.DevSteam|x64.ActiveCfg = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.DevSteam|x64.Build.0 = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.DevSteam|ARM64.Build.0 = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.MSIX Debug|x64.Build.0 = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.MSIX|x64.ActiveCfg = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.MSIX|x64.Build.0 = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.MSIX|ARM64.Build.0 = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.Release|x64.ActiveCfg = Release|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.Release|x64.Build.0 = Release|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.Release|ARM64.ActiveCfg = Release|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.Release|ARM64.Build.0 = Release|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.Steam|x64.ActiveCfg = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.Steam|x64.Build.0 = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.Steam|ARM64.ActiveCfg = Debug|Any CPU
{885A99AB-86F0-4D8E-A989-FB0000C1662D}.Steam|ARM64.Build.0 = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.Debug|x64.ActiveCfg = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.Debug|x64.Build.0 = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.Debug|ARM64.ActiveCfg = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.Debug|ARM64.Build.0 = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.DevRelease|x64.ActiveCfg = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.DevRelease|x64.Build.0 = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.DevRelease|ARM64.ActiveCfg = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.DevRelease|ARM64.Build.0 = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.DevSteam|x64.ActiveCfg = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.DevSteam|x64.Build.0 = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.DevSteam|ARM64.ActiveCfg = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.DevSteam|ARM64.Build.0 = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.MSIX Debug|x64.ActiveCfg = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.MSIX Debug|x64.Build.0 = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.MSIX Debug|ARM64.ActiveCfg = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.MSIX Debug|ARM64.Build.0 = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.MSIX|x64.ActiveCfg = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.MSIX|x64.Build.0 = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.MSIX|ARM64.ActiveCfg = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.MSIX|ARM64.Build.0 = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.Release|x64.ActiveCfg = Release|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.Release|x64.Build.0 = Release|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.Release|ARM64.ActiveCfg = Release|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.Release|ARM64.Build.0 = Release|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.Steam|x64.ActiveCfg = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.Steam|x64.Build.0 = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.Steam|ARM64.ActiveCfg = Debug|Any CPU
{ED673353-3433-4FCB-9199-0F8DE0968F52}.Steam|ARM64.Build.0 = Debug|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE
@ -1316,6 +1376,8 @@ Global
{FA293BD3-2D99-47BA-8C4F-53F4997CE99C} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813} {FA293BD3-2D99-47BA-8C4F-53F4997CE99C} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
{9CD22D8F-3F37-44F8-B106-7C1E02016F82} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813} {9CD22D8F-3F37-44F8-B106-7C1E02016F82} = {03CFB32D-E797-41B1-B072-A4FEBA5F8813}
{0258658B-78D5-4790-AF27-94B065DF529C} = {68C3DA2D-D2EA-426E-A866-0019E425C816} {0258658B-78D5-4790-AF27-94B065DF529C} = {68C3DA2D-D2EA-426E-A866-0019E425C816}
{885A99AB-86F0-4D8E-A989-FB0000C1662D} = {E8A74431-F76F-43B1-BC66-CA05E249E6F4}
{ED673353-3433-4FCB-9199-0F8DE0968F52} = {E8A74431-F76F-43B1-BC66-CA05E249E6F4}
EndGlobalSection EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D04B4AB0-CA33-42FD-A909-79966F9255C5} SolutionGuid = {D04B4AB0-CA33-42FD-A909-79966F9255C5}

2
src/PixiEditor/PixiEditor.csproj
View File

@ -100,10 +100,10 @@
<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0"/> <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.11.0"/>
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0"/> <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3"/> <PackageReference Include="Newtonsoft.Json" Version="13.0.3"/>
<PackageReference Include="PixiEditor.ColorPicker.AvaloniaUI" Version="1.0.6"/>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\ColorPicker\src\ColorPicker.AvaloniaUI\ColorPicker.AvaloniaUI.csproj" />
<ProjectReference Include="..\Drawie\src\Drawie.Interop.Avalonia\Drawie.Interop.Avalonia.csproj"/> <ProjectReference Include="..\Drawie\src\Drawie.Interop.Avalonia\Drawie.Interop.Avalonia.csproj"/>
<ProjectReference Include="..\Drawie\src\Drawie.Interop.Avalonia.Core\Drawie.Interop.Avalonia.Core.csproj"/> <ProjectReference Include="..\Drawie\src\Drawie.Interop.Avalonia.Core\Drawie.Interop.Avalonia.Core.csproj"/>
<ProjectReference Include="..\PixiDocks\src\PixiDocks.Avalonia\PixiDocks.Avalonia.csproj"/> <ProjectReference Include="..\PixiDocks\src\PixiDocks.Avalonia\PixiDocks.Avalonia.csproj"/>

1
src/colorpicker Submodule

@ -0,0 +1 @@
Subproject commit e707f2576d2a08600edbecee9d2aa6e3af2fafd2

2
tests/Directory.Build.props
View File

@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<CodeAnalysisRuleSet>../Custom.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>../Custom.ruleset</CodeAnalysisRuleSet>
<AvaloniaVersion>11.2.4</AvaloniaVersion> <AvaloniaVersion>11.2.5</AvaloniaVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" /> <PackageReference Include="StyleCop.Analyzers" Version="1.1.118" />