Adding UIPreviewColors to the settings for each ColorPalette

Author: PapeCoding

Src/DasherCore/ColorIO.cpp

@@ -77,13 +77,19 @@ bool CColorIO::Parse(pugi::xml_document& document, const std::string, bool bUser
 
 	std::unordered_map<NamedColor::knownColorName, ColorPalette::Color> NamedColors;
 	std::unordered_map<std::string, ColorPalette::GroupColorInfo> GroupColors;
+	std::vector<ColorPalette::Color> UIPreviewColors;
 	std::string parentName = outer.attribute("parentName").as_string(HardcodedDefaultPalette->PaletteName.c_str());
 	std::string colorSchemeName = outer.attribute("name").as_string(); // definitely exists, we checked above
 
 	for(pugi::xml_attribute attribute : outer.attributes())
 	{
 		if(strcmp(attribute.name(),"parentName") == 0 || strcmp(attribute.name(),"name") == 0) continue;
 
+		if(strcmp(attribute.name(),"uiPreviewColors") == 0){
+			UIPreviewColors = GetAttributeAsColorList(attribute);
+			continue;
+		}
+
 		NamedColors[attribute.name()] = ColorPalette::Color(attribute.as_string());
 	}
 
@@ -106,8 +112,24 @@ bool CColorIO::Parse(pugi::xml_document& document, const std::string, bool bUser
 		GroupColors[groupInfo.attribute("name").as_string()] = group;
 	}
 
+	//could not be loaded, determine default colors by search first group >=4 and sample four equally spaced colors
+	if(UIPreviewColors.size() != 4){
+		UIPreviewColors.clear();
+		for(auto& [name, group] : GroupColors){
+			if(group.nodeColorSequence.size() >= 4){
+				UIPreviewColors.push_back(group.nodeColorSequence.front());
+				UIPreviewColors.push_back(group.nodeColorSequence[group.nodeColorSequence.size() / 3]);
+				UIPreviewColors.push_back(group.nodeColorSequence[group.nodeColorSequence.size() / 3 * 2]);
+				UIPreviewColors.push_back(group.nodeColorSequence.back());
+				break;
+			}
+		}
+	}
+	std::array<ColorPalette::Color, 4> uiColorsArray;
+	std::copy_n(std::make_move_iterator(UIPreviewColors.begin()), uiColorsArray.size(), uiColorsArray.begin());
+
 	//"HardcodedDefault" is the parent for now, later on the parents get relinked by looking up the parentNames
-	KnownPalettes[colorSchemeName] = new ColorPalette(HardcodedDefaultPalette, parentName, NamedColors, GroupColors, colorSchemeName);
+	KnownPalettes[colorSchemeName] = new ColorPalette(HardcodedDefaultPalette, parentName, NamedColors, GroupColors, uiColorsArray, colorSchemeName);
 
 	return true;
 }
@@ -170,5 +192,12 @@ void CColorIO::CreateDefault() {
         {NamedColor::gameGuide, ColorPalette::Color(255, 100, 204, 255)}
 	};
 
-	HardcodedDefaultPalette = new ColorPalette(nullptr, "NonExistentRootRootPalette", NamedColors, {}, "HardcodedDefault"); //TODO: No groups for now, but will later be added
+	std::array<ColorPalette::Color, 4> uiColorsArray = {
+	ColorPalette::Color(0, 0, 0, 255),
+	ColorPalette::Color(255, 0, 255, 255),
+	ColorPalette::Color(0, 0, 0, 255),
+	ColorPalette::Color(255, 0, 255, 255)
+	};
+
+	HardcodedDefaultPalette = new ColorPalette(nullptr, "NonExistentRootRootPalette", NamedColors, {}, uiColorsArray, "HardcodedDefault"); //TODO: No groups for now, but will later be added
 }

Src/DasherCore/ColorPalette.cpp

@@ -65,8 +65,8 @@ ColorPalette::Color ColorPalette::Color::lerp(const Color& ColorA, const Color&
 
 ColorPalette::ColorPalette(ColorPalette* ParentPalette, std::string ParentPaletteName,
                            const std::unordered_map<NamedColor::knownColorName, Color>& NamedColors,
-    const std::unordered_map<std::string, GroupColorInfo>& GroupColors, std::string PaletteName) : ParentPalette(ParentPalette), ParentPaletteName(
-                                                                              std::move(ParentPaletteName)), NamedColors(NamedColors), GroupColors(GroupColors), PaletteName(PaletteName)
+    const std::unordered_map<std::string, GroupColorInfo>& GroupColors, std::array<Color,4> UIPreviewColors, std::string PaletteName) : ParentPalette(ParentPalette), ParentPaletteName(
+                                                                              std::move(ParentPaletteName)), NamedColors(NamedColors), GroupColors(GroupColors), UIPreviewColors(UIPreviewColors), PaletteName(PaletteName)
 {
 }
 
@@ -93,6 +93,11 @@ const ColorPalette::Color& ColorPalette::GetNamedColor(const NamedColor::knownCo
     return (ParentPalette && AskParent) ? ParentPalette->GetNamedColor(NamedColor) : undefinedColor;
 }
 
+const std::array<ColorPalette::Color,4>& ColorPalette::GetUIPreviewColors() const
+{
+    return UIPreviewColors;
+}
+
 const ColorPalette::Color& ColorPalette::GetGroupColor(const std::string& GroupName, const bool& UseAltColor) const
 {
     if(GroupName.empty()) return undefinedColor;

Src/DasherCore/ColorPalette.h

@@ -10,6 +10,7 @@
 
 #include <unordered_map>
 #include <vector>
+#include <array>
 #include <string>
 
 namespace Dasher {
@@ -93,7 +94,7 @@ namespace Dasher {
 			std::pair<Color,Color> groupLabelColor = {undefinedColor, undefinedColor};
 		} GroupColorInfo;
 
-		ColorPalette(ColorPalette* ParentPalette, std::string ParentPaletteName, const std::unordered_map<NamedColor::knownColorName, Color>& NamedColors, const std::unordered_map<std::string, GroupColorInfo>& GroupColors, std::string PaletteName);
+		ColorPalette(ColorPalette* ParentPalette, std::string ParentPaletteName, const std::unordered_map<NamedColor::knownColorName, Color>& NamedColors, const std::unordered_map<std::string, GroupColorInfo>& GroupColors, std::array<Color,4> UIPreviewColors, std::string PaletteName);
         const Color& GetAltColor(const std::vector<Color>& NormalColors, const std::vector<Color>& AltColors, bool useAlt, int Index) const;
         const Color& GetAltColor(const Color& NormalColor, const Color& AltColor, bool useAlt) const;
 
@@ -104,6 +105,8 @@ namespace Dasher {
 
 		const Color& GetNamedColor(const NamedColor::knownColorName& NamedColor, bool AskParent = true) const;
 
+		const std::array<Color,4>& GetUIPreviewColors() const;
+
 		const Color& GetGroupColor(const std::string& GroupName, const bool& UseAltColor) const;
         const Color& GetGroupOutlineColor(const std::string& GroupName, const bool& UseAltColor, bool UseDefaultColor = true) const;
 		const Color& GetGroupLabelColor(const std::string& GroupName, const bool& UseAltColor, bool UseDefaultColor = true) const;
@@ -114,6 +117,7 @@ namespace Dasher {
     private:
 	    std::unordered_map<NamedColor::knownColorName, Color> NamedColors;
 		std::unordered_map<std::string, GroupColorInfo> GroupColors;
+		std::array<Color,4> UIPreviewColors;
 	};