diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-01 16:55:27 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-09-01 16:55:27 (GMT) |
| commit | 618e29d5d487a2215628b5cf70ccc72462878201 (patch) | |
| tree | b7a940375cf681162e9e6522cfae3e427c9465e5 /src/game/GameView.h | |
| parent | 0a67e560f4ca85f16c24fa90cbcefa7e07bac62f (diff) | |
| download | powder-618e29d5d487a2215628b5cf70ccc72462878201.zip powder-618e29d5d487a2215628b5cf70ccc72462878201.tar.gz | |
Colour picker and presets for decorations
Diffstat (limited to 'src/game/GameView.h')
| -rw-r--r-- | src/game/GameView.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/game/GameView.h b/src/game/GameView.h index 32ccb86..7e5125b 100644 --- a/src/game/GameView.h +++ b/src/game/GameView.h @@ -88,15 +88,8 @@ private: ui::Button * pauseButton; ui::Point currentMouse; - ui::Slider * colourRSlider; - ui::Slider * colourGSlider; - ui::Slider * colourBSlider; - ui::Slider * colourASlider; - - ui::Textbox * colourRValue; - ui::Textbox * colourGValue; - ui::Textbox * colourBValue; - ui::Textbox * colourAValue; + ui::Button * colourPicker; + vector<ToolButton*> colourPresets; bool drawModeReset; ui::Point drawPoint1; @@ -116,8 +109,6 @@ private: int lastOffset; void setToolButtonOffset(int offset); - void changeColourSlider(); - void changeColourText(); virtual ui::Point lineSnapCoords(ui::Point point1, ui::Point point2); virtual ui::Point rectSnapCoords(ui::Point point1, ui::Point point2); @@ -157,6 +148,8 @@ public: void NotifyZoomChanged(GameModel * sender); void NotifyColourSelectorVisibilityChanged(GameModel * sender); void NotifyColourSelectorColourChanged(GameModel * sender); + void NotifyColourPresetsChanged(GameModel * sender); + void NotifyColourActivePresetChanged(GameModel * sender); void NotifyPlaceSaveChanged(GameModel * sender); void NotifyNotificationsChanged(GameModel * sender); void NotifyLogChanged(GameModel * sender, string entry); |