summaryrefslogtreecommitdiff
path: root/src/game/GameController.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/GameController.cpp')
-rw-r--r--src/game/GameController.cpp22
1 files changed, 22 insertions, 0 deletions
diff --git a/src/game/GameController.cpp b/src/game/GameController.cpp
index ffa763f..910673e 100644
--- a/src/game/GameController.cpp
+++ b/src/game/GameController.cpp
@@ -17,6 +17,7 @@
#include "GameModelException.h"
#include "simulation/Air.h"
#include "elementsearch/ElementSearchActivity.h"
+#include "colourpicker/ColourPickerActivity.h"
#include "update/UpdateActivity.h"
#include "Notification.h"
#include "filebrowser/FileBrowserActivity.h"
@@ -845,6 +846,11 @@ void GameController::SetDecoration()
gameModel->SetDecoration(!gameModel->GetDecoration());
}
+void GameController::SetActiveColourPreset(int preset)
+{
+ gameModel->SetActiveColourPreset(preset);
+}
+
void GameController::SetColour(ui::Colour colour)
{
gameModel->SetColourSelectorColour(colour);
@@ -965,6 +971,22 @@ void GameController::OpenElementSearch()
new ElementSearchActivity(gameModel, toolList);
}
+void GameController::OpenColourPicker()
+{
+ class ColourPickerCallback: public ColourPickedCallback
+ {
+ GameController * c;
+ public:
+ ColourPickerCallback(GameController * _c): c(_c) {}
+ virtual ~ColourPickerCallback() {};
+ virtual void ColourPicked(ui::Colour colour)
+ {
+ c->SetColour(colour);
+ }
+ };
+ new ColourPickerActivity(gameModel->GetColourSelectorColour(), new ColourPickerCallback(this));
+}
+
void GameController::OpenTags()
{
if(gameModel->GetUser().ID)