thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve layout of control mapping screen

Browse source
This commit is contained in:
Henrik Rydgard 2014-06-09 22:26:23 +02:00
parent e01f8232bd
commit c39c36ddea
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Common/KeyMap.cpp
View file

@ -626,10 +626,10 @@ const KeyMap_IntStrPair psp_button_names[] = {
{CTRL_LTRIGGER, "L"},
{CTRL_RTRIGGER, "R"},
{VIRTKEY_AXIS_Y_MAX, "An.Up"},
{VIRTKEY_AXIS_Y_MIN, "An.Down"},
{VIRTKEY_AXIS_X_MIN, "An.Left"},
{VIRTKEY_AXIS_X_MAX, "An.Right"},
{VIRTKEY_AXIS_Y_MAX, "Analog Up"},
{VIRTKEY_AXIS_Y_MIN, "Analog Down"},
{VIRTKEY_AXIS_X_MIN, "Analog Left"},
{VIRTKEY_AXIS_X_MAX, "Analog Right"},
#ifndef MOBILE_DEVICE
{ VIRTKEY_ANALOG_LIGHTLY, "Analog limiter" },
#endif

8
UI/ControlMappingScreen.cpp
View file

@ -96,7 +96,7 @@ void ControlMapper::Refresh() {
float itemH = 45;
LinearLayout *root = Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT)));
LinearLayout *root = Add(new LinearLayout(ORIENT_HORIZONTAL, new LinearLayoutParams(550, WRAP_CONTENT)));
root->SetSpacing(3.0f);
const int padding = 4;
@ -113,6 +113,9 @@ void ControlMapper::Refresh() {
root->Add(c)->OnClick.Handle(this, &ControlMapper::OnReplaceAll);
}
Choice *p = root->Add(new Choice(" + ", new LayoutParams(FILL_PARENT, itemH)));
p->OnClick.Handle(this, &ControlMapper::OnAdd);
LinearLayout *rightColumn = root->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT, 1.0f)));
rightColumn->SetSpacing(2.0f);
std::vector<KeyDef> mappings;
@ -135,9 +138,6 @@ void ControlMapper::Refresh() {
Choice *d = row->Add(new Choice(" X ", new LayoutParams(FILL_PARENT, itemH)));
d->SetTag(tagbuf);
d->OnClick.Handle(this, &ControlMapper::OnDelete);
Choice *p = row->Add(new Choice(" + ", new LayoutParams(FILL_PARENT, itemH)));
p->OnClick.Handle(this, &ControlMapper::OnAdd);
}
if (mappings.size() == 0) {