Style improvements to sign tool

This commit is contained in:
Simon Robertshaw
2012-05-14 20:51:16 +01:00
parent f39d2361e7
commit be849a9150

View File

@@ -1,4 +1,5 @@
#include <iostream> #include <iostream>
#include "Style.h"
#include "simulation/Simulation.h" #include "simulation/Simulation.h"
#include "Tool.h" #include "Tool.h"
#include "interface/Window.h" #include "interface/Window.h"
@@ -42,13 +43,14 @@ public:
}; };
SignWindow::SignWindow(SignTool * tool_, Simulation * sim_, int signID_, ui::Point position_): SignWindow::SignWindow(SignTool * tool_, Simulation * sim_, int signID_, ui::Point position_):
ui::Window(ui::Point(-1, -1), ui::Point(200, 75)), ui::Window(ui::Point(-1, -1), ui::Point(200, 87)),
tool(tool_), tool(tool_),
signID(signID_), signID(signID_),
sim(sim_), sim(sim_),
signPosition(position_) signPosition(position_)
{ {
ui::Label * messageLabel = new ui::Label(ui::Point(4, 2), ui::Point(Size.X-8, 14), "New sign"); ui::Label * messageLabel = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 14), "New sign");
messageLabel->SetTextColour(style::Colour::InformationTitle);
messageLabel->SetAlignment(AlignLeft, AlignTop); messageLabel->SetAlignment(AlignLeft, AlignTop);
AddComponent(messageLabel); AddComponent(messageLabel);
@@ -58,14 +60,14 @@ SignWindow::SignWindow(SignTool * tool_, Simulation * sim_, int signID_, ui::Poi
okayButton->SetActionCallback(new OkayAction(this)); okayButton->SetActionCallback(new OkayAction(this));
AddComponent(okayButton); AddComponent(okayButton);
justification = new ui::DropDown(ui::Point(8, 38), ui::Point(50, 16)); justification = new ui::DropDown(ui::Point(8, 46), ui::Point(50, 16));
AddComponent(justification); AddComponent(justification);
justification->AddOption(std::pair<std::string, int>("Left", (int)sign::Left)); justification->AddOption(std::pair<std::string, int>("Left", (int)sign::Left));
justification->AddOption(std::pair<std::string, int>("Centre", (int)sign::Centre)); justification->AddOption(std::pair<std::string, int>("Centre", (int)sign::Centre));
justification->AddOption(std::pair<std::string, int>("Right", (int)sign::Right)); justification->AddOption(std::pair<std::string, int>("Right", (int)sign::Right));
justification->SetOption(0); justification->SetOption(0);
textField = new ui::Textbox(ui::Point(8, 17), ui::Point(Size.X-16, 16), ""); textField = new ui::Textbox(ui::Point(8, 25), ui::Point(Size.X-16, 16), "");
textField->SetAlignment(AlignLeft, AlignBottom); textField->SetAlignment(AlignLeft, AlignBottom);
AddComponent(textField); AddComponent(textField);