diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-03-05 15:24:52 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-03-05 15:24:52 (GMT) |
| commit | 55acb6aa801f89f14ccc2ae469247149b19a806d (patch) | |
| tree | abddd11e985a92697a955bb770829c4f68dc6f92 /src/game/GameView.cpp | |
| parent | 644e6770e43e5ed568b0cdc14d63f20869d7fccc (diff) | |
| download | powder-55acb6aa801f89f14ccc2ae469247149b19a806d.zip powder-55acb6aa801f89f14ccc2ae469247149b19a806d.tar.gz | |
More fancy Sliders for deco colour
Diffstat (limited to 'src/game/GameView.cpp')
| -rw-r--r-- | src/game/GameView.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index 7969ed0..f84acb1 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -207,11 +207,11 @@ GameView::GameView(): } }; ColourChange * colC = new ColourChange(this); - colourRSlider = new ui::Slider(ui::Point(5, Size.Y-40), ui::Point(100, 16), 255); + colourRSlider = new ui::Slider(ui::Point(5, Size.Y-39), ui::Point(80, 14), 255); colourRSlider->SetActionCallback(colC); - colourGSlider = new ui::Slider(ui::Point(115, Size.Y-40), ui::Point(100, 16), 255); + colourGSlider = new ui::Slider(ui::Point(95, Size.Y-39), ui::Point(80, 14), 255); colourGSlider->SetActionCallback(colC); - colourBSlider = new ui::Slider(ui::Point(225, Size.Y-40), ui::Point(100, 16), 255); + colourBSlider = new ui::Slider(ui::Point(185, Size.Y-39), ui::Point(80, 14), 255); colourBSlider->SetActionCallback(colC); } @@ -367,8 +367,11 @@ void GameView::NotifyColourSelectorVisibilityChanged(GameModel * sender) void GameView::NotifyColourSelectorColourChanged(GameModel * sender) { colourRSlider->SetValue(sender->GetColourSelectorColour().Red); + colourRSlider->SetColour(ui::Colour(0, sender->GetColourSelectorColour().Green, sender->GetColourSelectorColour().Blue), ui::Colour(255, sender->GetColourSelectorColour().Green, sender->GetColourSelectorColour().Blue)); colourGSlider->SetValue(sender->GetColourSelectorColour().Green); + colourGSlider->SetColour(ui::Colour(sender->GetColourSelectorColour().Red, 0, sender->GetColourSelectorColour().Blue), ui::Colour(sender->GetColourSelectorColour().Red, 255, sender->GetColourSelectorColour().Blue)); colourBSlider->SetValue(sender->GetColourSelectorColour().Blue); + colourBSlider->SetColour(ui::Colour(sender->GetColourSelectorColour().Red, sender->GetColourSelectorColour().Green, 0), ui::Colour(sender->GetColourSelectorColour().Red, sender->GetColourSelectorColour().Green, 255)); vector<Tool*> tools = sender->GetMenuList()[SC_DECO]->GetToolList(); for(int i = 0; i < tools.size(); i++) |
