libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-28 10:51:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

link Choice onClick to checkbox Toggle so that click is registered

Browse Source 
fix merge linker error
This commit is contained in:
Siddharth 2013-10-27 10:57:25 +05:30
parent 70738c1755
commit ee58091b87
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
UI/TouchControlVisibilityScreen.cpp
View File

@ -71,20 +71,25 @@ void TouchControlVisibilityScreen::CreateViews() {
for (auto i = keyToggles.begin(); i != keyToggles.end(); ++i) {
LinearLayout *row = new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
row->SetSpacing(0);
row->Add(new CheckBox(i->second, "", "", new LinearLayoutParams(50, WRAP_CONTENT)));
CheckBox *checkbox = new CheckBox(i->second, "", "", new LinearLayoutParams(50, WRAP_CONTENT));
row->Add(checkbox);
imageFinder = keyImages.find(i->first);
Choice *choice;
if (imageFinder != keyImages.end()) {
choice = new Choice(keyImages[imageFinder->first], new LinearLayoutParams(1.0f));
choice->SetCentered(true);
row->Add(choice);
choice = new Choice(keyImages[imageFinder->first], new LinearLayoutParams(1.0f));
} else {
choice = new Choice(mc->T(i->first.c_str()), new LinearLayoutParams(1.0f));
choice->SetCentered(true);
row->Add(choice);
}
ChoiceEventHandler *choiceEventHandler = new ChoiceEventHandler(checkbox);
choice->OnClick.Handle(choiceEventHandler, &ChoiceEventHandler::onChoiceClick);
choice->SetCentered(true);
row->Add(choice);
grid->Add(row);
}
}
@ -106,3 +111,9 @@ UI::EventReturn TouchControlVisibilityScreen::OnToggleAll(UI::EventParams &e) {
return UI::EVENT_DONE;
}
UI::EventReturn TouchControlVisibilityScreen::ChoiceEventHandler::onChoiceClick(UI::EventParams &e){
checkbox_->Toggle();
return UI::EVENT_DONE;
};

13
UI/TouchControlVisibilityScreen.h
View File

@ -21,6 +21,10 @@
#include <map>
namespace UI {
class CheckBox;
}
class TouchControlVisibilityScreen : public UIScreenWithBackground {
public:
TouchControlVisibilityScreen() { }
@ -28,10 +32,17 @@ public:
virtual void CreateViews();
protected:
virtual UI::EventReturn OnBack(UI::EventParams &e);
virtual UI::EventReturn OnToggleAll(UI::EventParams &e);
private:
std::map<std::string, bool*> keyToggles;
bool toggleSwitch;
class ChoiceEventHandler{
public:
ChoiceEventHandler(UI::CheckBox *checkbox) : checkbox_(checkbox) {}
UI::EventReturn onChoiceClick(UI::EventParams &e);
private:
UI::CheckBox *checkbox_;
};
};