diff options
| author | Simon Robertshaw <simon@hardwired.org.uk> | 2012-02-01 18:45:59 (GMT) |
|---|---|---|
| committer | Simon Robertshaw <simon@hardwired.org.uk> | 2012-02-01 18:45:59 (GMT) |
| commit | 038da72c61ea6a251d805e2de3662f240da52b02 (patch) | |
| tree | 05170050b16f9d663ec44ae451211e686ba196ac /src/game/GameView.cpp | |
| parent | 857b0cc1fc58f066acd59404d16ee5e566e20f00 (diff) | |
| download | powder-038da72c61ea6a251d805e2de3662f240da52b02.zip powder-038da72c61ea6a251d805e2de3662f240da52b02.tar.gz | |
Console UI, open in browser button, tab and enter shortcut for Login UI, various
Diffstat (limited to 'src/game/GameView.cpp')
| -rw-r--r-- | src/game/GameView.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp index a443025..e93b9b7 100644 --- a/src/game/GameView.cpp +++ b/src/game/GameView.cpp @@ -277,6 +277,7 @@ void GameView::NotifyActiveToolsChanged(GameModel * sender) void GameView::NotifyToolListChanged(GameModel * sender) { + //int currentY = YRES+MENUSIZE-36; int currentX = XRES+BARSIZE-56; int totalColour; for(int i = 0; i < menuButtons.size(); i++) @@ -299,8 +300,10 @@ void GameView::NotifyToolListChanged(GameModel * sender) vector<Tool*> toolList = sender->GetToolList(); for(int i = 0; i < toolList.size(); i++) { - ToolButton * tempButton = new ToolButton(ui::Point(currentX, YRES), ui::Point(32, 16), toolList[i]->GetName()); - currentX -= 36; + //ToolButton * tempButton = new ToolButton(ui::Point(XRES+1, currentY), ui::Point(28, 15), toolList[i]->GetName()); + ToolButton * tempButton = new ToolButton(ui::Point(currentX, YRES+1), ui::Point(28, 15), toolList[i]->GetName()); + //currentY -= 17; + currentX -= 32; tempButton->SetActionCallback(new ToolAction(this, toolList[i])); tempButton->SetBackgroundColour(ui::Colour(toolList[i]->colRed, toolList[i]->colGreen, toolList[i]->colBlue)); @@ -507,6 +510,9 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool zoomCursorFixed = false; c->SetZoomEnabled(true); break; + case '`': + c->ShowConsole(); + break; } } |