From c2fac9b6de338fa5007f556721561f4eae46235b Mon Sep 17 00:00:00 2001 From: Ronen Date: Tue, 31 Oct 2023 21:27:16 +0200 Subject: [PATCH] removed the datatypes project + bugfix --- .../GeonBit.UI.DataTypes.csproj | 18 ------------------ GeonBit.UI.DataTypes/README.md | 4 ---- GeonBit.UI.nuspec | 2 -- GeonBit.UI.sln | 10 ++-------- GeonBit.UI/Content/GeonBit.UI.DataTypes.dll | Bin 9216 -> 0 bytes GeonBit.UI/GeonBit.UI.csproj | 3 --- .../Source/DataTypes}/CursorTextureData.cs | 0 .../Source/DataTypes}/DefaultStyles.cs | 0 .../Source/DataTypes}/StyleProperty.cs | 0 .../Source/DataTypes}/TextureData.cs | 0 .../Source/DataTypes}/ThemeSettings.cs | 0 README.md | 2 ++ 12 files changed, 4 insertions(+), 35 deletions(-) delete mode 100644 GeonBit.UI.DataTypes/GeonBit.UI.DataTypes.csproj delete mode 100644 GeonBit.UI.DataTypes/README.md delete mode 100644 GeonBit.UI/Content/GeonBit.UI.DataTypes.dll rename {GeonBit.UI.DataTypes/Source => GeonBit.UI/Source/DataTypes}/CursorTextureData.cs (100%) rename {GeonBit.UI.DataTypes/Source => GeonBit.UI/Source/DataTypes}/DefaultStyles.cs (100%) rename {GeonBit.UI.DataTypes/Source => GeonBit.UI/Source/DataTypes}/StyleProperty.cs (100%) rename {GeonBit.UI.DataTypes/Source => GeonBit.UI/Source/DataTypes}/TextureData.cs (100%) rename {GeonBit.UI.DataTypes/Source => GeonBit.UI/Source/DataTypes}/ThemeSettings.cs (100%) diff --git a/GeonBit.UI.DataTypes/GeonBit.UI.DataTypes.csproj b/GeonBit.UI.DataTypes/GeonBit.UI.DataTypes.csproj deleted file mode 100644 index 0304f9b..0000000 --- a/GeonBit.UI.DataTypes/GeonBit.UI.DataTypes.csproj +++ /dev/null @@ -1,18 +0,0 @@ - - - - net6.0 - enable - enable - - - - - - - - - - - - diff --git a/GeonBit.UI.DataTypes/README.md b/GeonBit.UI.DataTypes/README.md deleted file mode 100644 index 978a1b1..0000000 --- a/GeonBit.UI.DataTypes/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# GeonBit.UI.DataTypes - -A small lib to define classes we want to serialize from XML content files. -This has to be a separated dll so we can use it with the content manager of the main project. \ No newline at end of file diff --git a/GeonBit.UI.nuspec b/GeonBit.UI.nuspec index eaf38f3..53ce8c0 100644 --- a/GeonBit.UI.nuspec +++ b/GeonBit.UI.nuspec @@ -21,9 +21,7 @@ It provide all the basic elements required to make a game / editor UI, and comes - - diff --git a/GeonBit.UI.sln b/GeonBit.UI.sln index 2290cc7..6241f75 100644 --- a/GeonBit.UI.sln +++ b/GeonBit.UI.sln @@ -3,11 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.7.34031.279 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeonBit.UI", "GeonBit.UI\GeonBit.UI.csproj", "{0651DD1F-DB39-4617-B373-950AE63D7A5A}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeonBit.UI", "GeonBit.UI\GeonBit.UI.csproj", "{0651DD1F-DB39-4617-B373-950AE63D7A5A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeonBit.UI.DataTypes", "GeonBit.UI.DataTypes\GeonBit.UI.DataTypes.csproj", "{B994B307-EDA6-4211-A098-F1EF6F90BC39}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GeonBit.UI.Examples", "GeonBit.UI.Examples\GeonBit.UI.Examples.csproj", "{A67EAC37-30E0-4C3A-A366-02B73519CA03}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GeonBit.UI.Examples", "GeonBit.UI.Examples\GeonBit.UI.Examples.csproj", "{A67EAC37-30E0-4C3A-A366-02B73519CA03}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -19,10 +17,6 @@ Global {0651DD1F-DB39-4617-B373-950AE63D7A5A}.Debug|Any CPU.Build.0 = Debug|Any CPU {0651DD1F-DB39-4617-B373-950AE63D7A5A}.Release|Any CPU.ActiveCfg = Release|Any CPU {0651DD1F-DB39-4617-B373-950AE63D7A5A}.Release|Any CPU.Build.0 = Release|Any CPU - {B994B307-EDA6-4211-A098-F1EF6F90BC39}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B994B307-EDA6-4211-A098-F1EF6F90BC39}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B994B307-EDA6-4211-A098-F1EF6F90BC39}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B994B307-EDA6-4211-A098-F1EF6F90BC39}.Release|Any CPU.Build.0 = Release|Any CPU {A67EAC37-30E0-4C3A-A366-02B73519CA03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {A67EAC37-30E0-4C3A-A366-02B73519CA03}.Debug|Any CPU.Build.0 = Debug|Any CPU {A67EAC37-30E0-4C3A-A366-02B73519CA03}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/GeonBit.UI/Content/GeonBit.UI.DataTypes.dll b/GeonBit.UI/Content/GeonBit.UI.DataTypes.dll deleted file mode 100644 index 16056d75deb89595a4ad4ea978998e976029adbb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9216 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 diff --git a/GeonBit.UI/GeonBit.UI.csproj b/GeonBit.UI/GeonBit.UI.csproj index 0534a75..3ea890d 100644 --- a/GeonBit.UI/GeonBit.UI.csproj +++ b/GeonBit.UI/GeonBit.UI.csproj @@ -23,9 +23,6 @@ - - - diff --git a/GeonBit.UI.DataTypes/Source/CursorTextureData.cs b/GeonBit.UI/Source/DataTypes/CursorTextureData.cs similarity index 100% rename from GeonBit.UI.DataTypes/Source/CursorTextureData.cs rename to GeonBit.UI/Source/DataTypes/CursorTextureData.cs diff --git a/GeonBit.UI.DataTypes/Source/DefaultStyles.cs b/GeonBit.UI/Source/DataTypes/DefaultStyles.cs similarity index 100% rename from GeonBit.UI.DataTypes/Source/DefaultStyles.cs rename to GeonBit.UI/Source/DataTypes/DefaultStyles.cs diff --git a/GeonBit.UI.DataTypes/Source/StyleProperty.cs b/GeonBit.UI/Source/DataTypes/StyleProperty.cs similarity index 100% rename from GeonBit.UI.DataTypes/Source/StyleProperty.cs rename to GeonBit.UI/Source/DataTypes/StyleProperty.cs diff --git a/GeonBit.UI.DataTypes/Source/TextureData.cs b/GeonBit.UI/Source/DataTypes/TextureData.cs similarity index 100% rename from GeonBit.UI.DataTypes/Source/TextureData.cs rename to GeonBit.UI/Source/DataTypes/TextureData.cs diff --git a/GeonBit.UI.DataTypes/Source/ThemeSettings.cs b/GeonBit.UI/Source/DataTypes/ThemeSettings.cs similarity index 100% rename from GeonBit.UI.DataTypes/Source/ThemeSettings.cs rename to GeonBit.UI/Source/DataTypes/ThemeSettings.cs diff --git a/README.md b/README.md index 1991bb6..b71e7df 100644 --- a/README.md +++ b/README.md @@ -2126,7 +2126,9 @@ If you want to use the new files dialog, you must include the new textures that ### 4.3.0.0 - Removed the XNA XMLs for stylesheets, and switched to regular XML files. Trying to use the content manager for XML was a pure nightmare and added zero value. +- Removed the data types project. The entire package is now a single project + another project for demos. - Fixed files dialog to show folders if can pick them, even if can't change root folder. +- Fixed background offset bug in selected list item with icon. ## Credits