summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
Diffstat (limited to 'src/game')
-rw-r--r--src/game/DecorationTool.h2
-rw-r--r--src/game/GameView.cpp8
2 files changed, 9 insertions, 1 deletions
diff --git a/src/game/DecorationTool.h b/src/game/DecorationTool.h
index e2e4758..39c070b 100644
--- a/src/game/DecorationTool.h
+++ b/src/game/DecorationTool.h
@@ -29,7 +29,7 @@ public:
virtual void Draw(Simulation * sim, Brush * brush, ui::Point position){
sim->ApplyDecorationPoint(position.X, position.Y, Red, Green, Blue, Alpha, decoMode, brush);
}
- virtual void DrawLine(Simulation * sim, Brush * brush, ui::Point position1, ui::Point position2) {
+ virtual void DrawLine(Simulation * sim, Brush * brush, ui::Point position1, ui::Point position2, bool dragging) {
sim->ApplyDecorationLine(position1.X, position1.Y, position2.X, position2.Y, Red, Green, Blue, Alpha, decoMode, brush);
}
virtual void DrawRect(Simulation * sim, Brush * brush, ui::Point position1, ui::Point position2) {
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index d7d0a50..5c4ecee 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -253,21 +253,29 @@ GameView::GameView():
colourRSlider->SetActionCallback(new ColourChange(this));
colourRValue = new ui::Textbox(ui::Point(60, Size.Y-41), ui::Point(25, 17), "255");
colourRValue->SetActionCallback(new ColourChange(this));
+ colourRValue->SetLimit(3);
+ colourRValue->SetInputType(ui::Textbox::Number);
colourGSlider = new ui::Slider(ui::Point(95, Size.Y-39), ui::Point(50, 14), 255);
colourGSlider->SetActionCallback(new ColourChange(this));
colourGValue = new ui::Textbox(ui::Point(150, Size.Y-41), ui::Point(25, 17), "255");
colourGValue->SetActionCallback(new ColourChange(this));
+ colourGValue->SetLimit(3);
+ colourGValue->SetInputType(ui::Textbox::Number);
colourBSlider = new ui::Slider(ui::Point(185, Size.Y-39), ui::Point(50, 14), 255);
colourBSlider->SetActionCallback(new ColourChange(this));
colourBValue = new ui::Textbox(ui::Point(240, Size.Y-41), ui::Point(25, 17), "255");
colourBValue->SetActionCallback(new ColourChange(this));
+ colourBValue->SetLimit(3);
+ colourBValue->SetInputType(ui::Textbox::Number);
colourASlider = new ui::Slider(ui::Point(275, Size.Y-39), ui::Point(50, 14), 255);
colourASlider->SetActionCallback(new ColourChange(this));
colourAValue = new ui::Textbox(ui::Point(330, Size.Y-41), ui::Point(25, 17), "255");
colourAValue->SetActionCallback(new ColourChange(this));
+ colourAValue->SetLimit(3);
+ colourAValue->SetInputType(ui::Textbox::Number);
class ElementSearchAction : public ui::ButtonAction
{