diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-03-05 17:10:18 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-03-05 17:10:18 (GMT) |
| commit | 81f3114cb22592a8c09fa564db49fbea079f1328 (patch) | |
| tree | 47c0faf05e2dd2adfcdb965542b2012465591c63 /src/game/GameView.cpp | |
| parent | 55acb6aa801f89f14ccc2ae469247149b19a806d (diff) | |
| download | powder-81f3114cb22592a8c09fa564db49fbea079f1328.zip powder-81f3114cb22592a8c09fa564db49fbea079f1328.tar.gz | |
Better sliders for Decoration editor
Diffstat (limited to 'src/game/GameView.cpp')
| -rw-r--r-- | src/game/GameView.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index f84acb1..82293e4 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -213,6 +213,8 @@ GameView::GameView(): colourGSlider->SetActionCallback(colC); colourBSlider = new ui::Slider(ui::Point(185, Size.Y-39), ui::Point(80, 14), 255); colourBSlider->SetActionCallback(colC); + colourASlider = new ui::Slider(ui::Point(275, Size.Y-39), ui::Point(50, 14), 255); + colourASlider->SetActionCallback(colC); } class GameView::MenuAction: public ui::ButtonAction @@ -355,11 +357,14 @@ void GameView::NotifyColourSelectorVisibilityChanged(GameModel * sender) colourGSlider->SetParentWindow(NULL); RemoveComponent(colourBSlider); colourBSlider->SetParentWindow(NULL); + RemoveComponent(colourASlider); + colourASlider->SetParentWindow(NULL); if(sender->GetColourSelectorVisibility()) { AddComponent(colourRSlider); AddComponent(colourGSlider); AddComponent(colourBSlider); + AddComponent(colourASlider); } } @@ -372,15 +377,8 @@ void GameView::NotifyColourSelectorColourChanged(GameModel * sender) 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++) - { - tools[i]->colRed = sender->GetColourSelectorColour().Red; - tools[i]->colGreen = sender->GetColourSelectorColour().Green; - tools[i]->colBlue = sender->GetColourSelectorColour().Blue; - } - NotifyToolListChanged(sender); + colourASlider->SetValue(sender->GetColourSelectorColour().Alpha); + colourASlider->SetColour(ui::Colour(0, 0, 0), ui::Colour(255, 255, 255)); } void GameView::NotifyRendererChanged(GameModel * sender) @@ -622,7 +620,7 @@ void GameView::NotifyZoomChanged(GameModel * sender) void GameView::changeColour() { - c->SetColour(ui::Colour(colourRSlider->GetValue(), colourGSlider->GetValue(), colourBSlider->GetValue())); + c->SetColour(ui::Colour(colourRSlider->GetValue(), colourGSlider->GetValue(), colourBSlider->GetValue(), colourASlider->GetValue())); } void GameView::OnDraw() |