preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-09-04 03:35:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

UI: Try to keep button visible while mapping.

Browse Source
This commit is contained in:
Unknown W. Brackets
2021-08-28 16:29:27 -07:00
parent efeca78c1a
commit f7b92ebb29
4 changed files with 43 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/ControlMappingScreen.cpp
+34 -13
View File
@@ -999,6 +999,7 @@ public:
MockPSP(UI::LayoutParams *layoutParams = nullptr);
void SelectButton(int btn);
float GetPopupOffset();
UI::Event ButtonClick;
@@ -1044,6 +1045,18 @@ void MockPSP::SelectButton(int btn) {
selectedButton_ = btn;
}
float MockPSP::GetPopupOffset() {
MockButton *view = buttons_[selectedButton_];
if (!view)
return 0.0f;
float ypos = view->GetBounds().centerY();
if (ypos > bounds_.centerY()) {
return -0.25f;
}
return 0.25f;
}
UI::AnchorLayoutParams *MockPSP::LayoutAt(float l, float t, float r, float b) {
return new UI::AnchorLayoutParams(l * SCALE, t * SCALE, r * SCALE, b * SCALE);
}
@@ -1112,24 +1125,20 @@ void VisualMappingScreen::CreateViews() {
root_->Add(rightColumn);
}
void VisualMappingScreen::resized() {
RecreateViews();
}
UI::EventReturn VisualMappingScreen::OnMapButton(UI::EventParams &e) {
auto km = GetI18NCategory("KeyMapping");
nextKey_ = e.a;
psp_->SelectButton(nextKey_);
screenManager()->push(new KeyMappingNewKeyDialog(nextKey_, true, std::bind(&VisualMappingScreen::HandleKeyMapping, this, std::placeholders::_1), km));
MapNext();
return UI::EVENT_DONE;
}
UI::EventReturn VisualMappingScreen::OnBindAll(UI::EventParams &e) {
auto km = GetI18NCategory("KeyMapping");
bindAll_ = 0;
nextKey_ = bindAllOrder[bindAll_];
psp_->SelectButton(nextKey_);
screenManager()->push(new KeyMappingNewKeyDialog(nextKey_, true, std::bind(&VisualMappingScreen::HandleKeyMapping, this, std::placeholders::_1), km));
MapNext();
return UI::EVENT_DONE;
}
@@ -1156,14 +1165,26 @@ void VisualMappingScreen::HandleKeyMapping(KeyDef key) {
}
void VisualMappingScreen::dialogFinished(const Screen *dialog, DialogResult result) {
auto km = GetI18NCategory("KeyMapping");
if (result == DR_YES && nextKey_ != 0) {
screenManager()->push(new KeyMappingNewKeyDialog(nextKey_, true, std::bind(&VisualMappingScreen::HandleKeyMapping, this, std::placeholders::_1), km));
MapNext();
} else {
nextKey_ = 0;
bindAll_ = -1;
psp_->SelectButton(0);
}
}
void VisualMappingScreen::MapNext() {
auto km = GetI18NCategory("KeyMapping");
if (nextKey_ == VIRTKEY_AXIS_Y_MIN || nextKey_ == VIRTKEY_AXIS_X_MIN || nextKey_ == VIRTKEY_AXIS_X_MAX) {
psp_->SelectButton(VIRTKEY_AXIS_Y_MAX);
} else {
psp_->SelectButton(nextKey_);
}
auto dialog = new KeyMappingNewKeyDialog(nextKey_, true, std::bind(&VisualMappingScreen::HandleKeyMapping, this, std::placeholders::_1), km);
Bounds bounds = screenManager()->getUIContext()->GetLayoutBounds();
dialog->SetPopupOffset(psp_->GetPopupOffset() * bounds.h);
screenManager()->push(dialog);
}