From 52ab401c79ebcfb65dcb08cdd1cea2367e0e7cf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Krzysztof=20Krysi=C5=84ski?= Date: Wed, 5 Mar 2025 10:29:28 +0100 Subject: [PATCH] Added color picker as submodule --- .gitmodules | 3 ++ src/Directory.Build.props | 2 +- src/PixiDocks | 2 +- src/PixiEditor.sln | 62 ++++++++++++++++++++++++++++++++ src/PixiEditor/PixiEditor.csproj | 2 +- src/colorpicker | 1 + tests/Directory.Build.props | 2 +- 7 files changed, 70 insertions(+), 4 deletions(-) create mode 160000 src/colorpicker diff --git a/.gitmodules b/.gitmodules index f25aa2e8d..6fd6bf9d4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,3 +7,6 @@ [submodule "src/Drawie"] path = src/Drawie url = https://github.com/PixiEditor/Drawie.git +[submodule "src/ColorPicker"] + path = src/ColorPicker + url = https://github.com/PixiEditor/ColorPicker.git diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 814d16508..4f64af6d0 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,7 +1,7 @@ ../Custom.ruleset - 11.2.4 + 11.2.5 diff --git a/src/PixiDocks b/src/PixiDocks index 261d8e702..71c3120ed 160000 --- a/src/PixiDocks +++ b/src/PixiDocks @@ -1 +1 @@ -Subproject commit 261d8e70227a68d6bc76883af4d1f76b2e6f467d +Subproject commit 71c3120eda7a644c7da88885504a9e30de68161d diff --git a/src/PixiEditor.sln b/src/PixiEditor.sln index 30e431faf..713cd4c34 100644 --- a/src/PixiEditor.sln +++ b/src/PixiEditor.sln @@ -132,6 +132,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Drawie.Interop.Avalonia.Cor EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PixiEditor.UpdateInstaller.Exe", "PixiEditor.UpdateInstaller.Exe\PixiEditor.UpdateInstaller.Exe.csproj", "{0258658B-78D5-4790-AF27-94B065DF529C}" 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 GlobalSection(SolutionConfigurationPlatforms) = preSolution 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|ARM64.ActiveCfg = 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 GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -1316,6 +1376,8 @@ Global {FA293BD3-2D99-47BA-8C4F-53F4997CE99C} = {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} + {885A99AB-86F0-4D8E-A989-FB0000C1662D} = {E8A74431-F76F-43B1-BC66-CA05E249E6F4} + {ED673353-3433-4FCB-9199-0F8DE0968F52} = {E8A74431-F76F-43B1-BC66-CA05E249E6F4} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {D04B4AB0-CA33-42FD-A909-79966F9255C5} diff --git a/src/PixiEditor/PixiEditor.csproj b/src/PixiEditor/PixiEditor.csproj index 7f4169b9e..e9ea26b85 100644 --- a/src/PixiEditor/PixiEditor.csproj +++ b/src/PixiEditor/PixiEditor.csproj @@ -100,10 +100,10 @@ - + diff --git a/src/colorpicker b/src/colorpicker new file mode 160000 index 000000000..e707f2576 --- /dev/null +++ b/src/colorpicker @@ -0,0 +1 @@ +Subproject commit e707f2576d2a08600edbecee9d2aa6e3af2fafd2 diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props index 52937fa57..2873f783d 100644 --- a/tests/Directory.Build.props +++ b/tests/Directory.Build.props @@ -1,7 +1,7 @@ ../Custom.ruleset - 11.2.4 + 11.2.5