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

allow favoriting / ctrl+alt selecting elements in element search ui

Browse Source
This commit is contained in:
jacob1 2016-07-24 22:31:31 -04:00
parent ae247a2d2b
commit 8efe8853de
2 changed files with 57 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@
#include "gui/interface/Keys.h" #include "gui/interface/Keys.h"
#include "gui/game/Tool.h" #include "gui/game/Tool.h"
#include "gui/Style.h" #include "gui/Style.h"
#include "gui/game/Favorite.h"
#include "gui/game/GameController.h" #include "gui/game/GameController.h"
class ElementSearchActivity::ToolAction: public ui::ButtonAction class ElementSearchActivity::ToolAction: public ui::ButtonAction
@ -26,6 +27,9 @@ ElementSearchActivity::ElementSearchActivity(GameController * gameController, st
firstResult(NULL), firstResult(NULL),
gameController(gameController), gameController(gameController),
tools(tools), tools(tools),
shiftPressed(false),
ctrlPressed(false),
altPressed(false),
exit(false) 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");
@ -167,7 +171,18 @@ void ElementSearchActivity::searchTools(std::string query)
void ElementSearchActivity::SetActiveTool(int selectionState, Tool * tool) void ElementSearchActivity::SetActiveTool(int selectionState, Tool * tool)
{ {
gameController->SetActiveTool(selectionState, tool); if (ctrlPressed && shiftPressed && !altPressed)
{
Favorite::Ref().AddFavorite(tool->GetIdentifier());
gameController->RebuildFavoritesMenu();
}
else if (ctrlPressed && altPressed && !shiftPressed &&
tool->GetIdentifier().find("DEFAULT_PT_") != tool->GetIdentifier().npos)
{
gameController->SetActiveTool(3, tool);
}
else
gameController->SetActiveTool(selectionState, tool);
exit = true; exit = true;
} }
@ -188,15 +203,46 @@ void ElementSearchActivity::OnTick(float dt)
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 == SDLK_KP_ENTER || key == SDLK_RETURN) switch (key)
{ {
case SDLK_KP_ENTER:
case SDLK_RETURN:
if(firstResult) if(firstResult)
gameController->SetActiveTool(0, firstResult); gameController->SetActiveTool(0, firstResult);
case SDLK_ESCAPE:
exit = true; exit = true;
break;
case SDLK_LSHIFT:
case SDLK_RSHIFT:
shiftPressed = true;
break;
case SDLK_LCTRL:
case SDLK_RCTRL:
ctrlPressed = true;
break;
case SDLK_LALT:
case SDLK_RALT:
altPressed = true;
break;
} }
if (key == SDLK_ESCAPE) }
void ElementSearchActivity::OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt)
{
switch (key)
{ {
exit = true; case SDLK_LSHIFT:
case SDLK_RSHIFT:
shiftPressed = false;
break;
case SDLK_LCTRL:
case SDLK_RCTRL:
ctrlPressed = false;
break;
case SDLK_LALT:
case SDLK_RALT:
altPressed = false;
break;
} }
} }

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

@ -9,16 +9,20 @@
#include "gui/game/ToolButton.h" #include "gui/game/ToolButton.h"
class Tool; class Tool;
class GameController; class GameController;
class ElementSearchActivity: public WindowActivity { class ElementSearchActivity: public WindowActivity
{
Tool * firstResult; Tool * firstResult;
GameController * gameController; GameController * gameController;
std::vector<Tool*> tools; std::vector<Tool*> tools;
ui::Textbox * searchField; ui::Textbox * searchField;
std::vector<ToolButton*> toolButtons; std::vector<ToolButton*> toolButtons;
bool shiftPressed;
bool ctrlPressed;
bool altPressed;
void searchTools(std::string query); void searchTools(std::string query);
public: public:
class ToolAction; class ToolAction;
bool exit; bool exit;
@ -29,6 +33,7 @@ public:
virtual void OnDraw(); virtual void OnDraw();
virtual void OnTick(float dt); 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);
virtual void OnKeyRelease(int key, Uint16 character, bool shift, bool ctrl, bool alt);
}; };
#endif /* ELEMENTSEARCHACTIVITY_H_ */ #endif /* ELEMENTSEARCHACTIVITY_H_ */