matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix crash when selecting PROP from element search, fixes #209

Browse Source
This commit is contained in:
jacob1 2014-08-11 00:56:26 -04:00
parent fb49a492a1
commit 7740980fcc
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/elementsearch/ElementSearchActivity.cpp
View File

@ -25,7 +25,8 @@ ElementSearchActivity::ElementSearchActivity(GameController * gameController, st
WindowActivity(ui::Point(-1, -1), ui::Point(236, 302)), WindowActivity(ui::Point(-1, -1), ui::Point(236, 302)),
gameController(gameController), gameController(gameController),
tools(tools), tools(tools),
firstResult(NULL) firstResult(NULL),
exit(false)
{ {
ui::Label * title = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 15), "Element Search"); ui::Label * title = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 15), "Element Search");
title->SetTextColour(style::Colour::InformationTitle); title->SetTextColour(style::Colour::InformationTitle);
@ -56,7 +57,7 @@ ElementSearchActivity::ElementSearchActivity(GameController * gameController, st
CloseAction(ElementSearchActivity * a) : a(a) { } CloseAction(ElementSearchActivity * a) : a(a) { }
void ActionCallback(ui::Button * sender_) void ActionCallback(ui::Button * sender_)
{ {
a->Exit(); a->exit = true;
} }
}; };
@ -167,7 +168,7 @@ void ElementSearchActivity::searchTools(std::string query)
void ElementSearchActivity::SetActiveTool(int selectionState, Tool * tool) void ElementSearchActivity::SetActiveTool(int selectionState, Tool * tool)
{ {
gameController->SetActiveTool(selectionState, tool); gameController->SetActiveTool(selectionState, tool);
Exit(); exit = true;
} }
void ElementSearchActivity::OnDraw() void ElementSearchActivity::OnDraw()
@ -179,17 +180,23 @@ void ElementSearchActivity::OnDraw()
g->drawrect(Position.X+searchField->Position.X, Position.Y+searchField->Position.Y+searchField->Size.Y+8, searchField->Size.X, Size.Y-(searchField->Position.Y+searchField->Size.Y+8)-23, 255, 255, 255, 180); g->drawrect(Position.X+searchField->Position.X, Position.Y+searchField->Position.Y+searchField->Size.Y+8, searchField->Size.X, Size.Y-(searchField->Position.Y+searchField->Size.Y+8)-23, 255, 255, 255, 180);
} }
void ElementSearchActivity::OnTick(float dt)
{
if (exit)
Exit();
}
void ElementSearchActivity::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt) void ElementSearchActivity::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt)
{ {
if(key == KEY_ENTER || key == KEY_RETURN) if(key == KEY_ENTER || key == KEY_RETURN)
{ {
if(firstResult) if(firstResult)
gameController->SetActiveTool(0, firstResult); gameController->SetActiveTool(0, firstResult);
Exit(); exit = true;
} }
if(key == KEY_ESCAPE) if(key == KEY_ESCAPE)
{ {
Exit(); exit = true;
} }
} }

2
src/gui/elementsearch/ElementSearchActivity.h
View File

@ -21,11 +21,13 @@ class ElementSearchActivity: public WindowActivity {
void searchTools(std::string query); void searchTools(std::string query);
public: public:
class ToolAction; class ToolAction;
bool exit;
Tool * GetFirstResult() { return firstResult; } Tool * GetFirstResult() { return firstResult; }
ElementSearchActivity(GameController * gameController, std::vector<Tool*> tools); ElementSearchActivity(GameController * gameController, std::vector<Tool*> tools);
void SetActiveTool(int selectionState, Tool * tool); void SetActiveTool(int selectionState, Tool * tool);
virtual ~ElementSearchActivity(); virtual ~ElementSearchActivity();
virtual void OnDraw(); virtual void OnDraw();
virtual void OnTick(float dt);
virtual void OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt); virtual void OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool alt);
}; };