Colour picker and presets for decorations

1 files changed, 14 insertions, 2 deletions

diff --git a/src/game/GameModel.h b/src/game/GameModel.h
index 847e940..a46bfd3 100644
--- a/src/game/GameModel.h
+++ b/src/game/GameModel.h
@@ -60,11 +60,14 @@ private:
 	Tool * lastTool;
 	Tool * activeTools[3];
 	User currentUser;
-	bool colourSelector;
-	ui::Colour colour;
 	float toolStrength;
 	std::deque<Snapshot*> history;
 
+	int activeColourPreset;
+	std::vector<ui::Colour> colourPresets;
+	bool colourSelector;
+	ui::Colour colour;
+
 	std::string infoTip;
 	std::string toolTip;
 	//bool zoomEnabled;
@@ -83,6 +86,8 @@ private:
 	void notifyPlaceSaveChanged();
 	void notifyColourSelectorColourChanged();
 	void notifyColourSelectorVisibilityChanged();
+	void notifyColourPresetsChanged();
+	void notifyColourActivePresetChanged();
 	void notifyNotificationsChanged();
 	void notifyLogChanged(string entry);
 	void notifyInfoTipChanged();
@@ -93,6 +98,13 @@ public:
 	GameModel();
 	~GameModel();
 
+	void SetActiveColourPreset(int preset);
+	int GetActiveColourPreset();
+
+	void SetPresetColour(ui::Colour colour);
+
+	std::vector<ui::Colour> GetColourPresets();
+
 	void SetColourSelectorVisibility(bool visibility);
 	bool GetColourSelectorVisibility();