Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Flip the problem on its head

Browse Source
This commit is contained in:
Henrik Rydgård 2023-09-04 10:54:17 +02:00
parent cd78097e74
commit 005b072fdc
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
UI/OnScreenDisplay.cpp
View File

@ -367,6 +367,8 @@ void OnScreenMessagesView::Draw(UIContext &dc) {
edges[(size_t)pos].maxWidth = std::max(edges[(size_t)pos].maxWidth, measuredEntry.w);
}
std::vector<DismissZone> dismissZones;
// Now, perform layout for all 8 edges.
for (size_t i = 0; i < (size_t)ScreenEdgePosition::VALUE_COUNT; i++) {
if (edges[i].height == 0.0f) {
@ -448,19 +450,15 @@ void OnScreenMessagesView::Draw(UIContext &dc) {
}
}
// Quick hack for dismissing messages by touch.
for (auto &touch : touches_) {
if (b.Contains(touch.x, touch.y)) {
INFO_LOG(G3D, "Dismissing entry %d (%0.1f %0.1f vs %0.1f %0.1f %0.1f %0.f)", j, touch.x, touch.y, bounds_.x, bounds_.y, bounds_.w, bounds_.h);
g_OSD.DismissEntry(j, now);
}
}
// Save the location of the popup, for easy dismissal.
dismissZones.push_back(DismissZone{ (int)j, b });
y += (measuredEntry.h + 4.0f) * measuredEntry.alpha;
}
}
touches_.clear();
std::lock_guard<std::mutex> lock(dismissMutex_);
dismissZones_ = dismissZones;
}
std::string OnScreenMessagesView::DescribeText() const {
@ -477,9 +475,19 @@ std::string OnScreenMessagesView::DescribeText() const {
bool OnScreenMessagesView::Touch(const TouchInput &input) {
if (input.flags & TOUCH_DOWN) {
touches_.push_back(input);
bool dismissed = false;
std::lock_guard<std::mutex> lock(dismissMutex_);
double now = time_now_d();
for (auto &zone : dismissZones_) {
if (zone.bounds.Contains(input.x, input.y)) {
g_OSD.DismissEntry(zone.index, now);
dismissed = true;
}
}
return dismissed;
} else {
return false;
}
return true;
}
void OSDOverlayScreen::CreateViews() {

9
UI/OnScreenDisplay.h
View File

@ -24,7 +24,14 @@ public:
bool Touch(const TouchInput &input) override;
std::string DescribeText() const override;
private:
std::vector<TouchInput> touches_;
struct DismissZone {
int index;
Bounds bounds;
};
// Argh, would really like to avoid this.
std::mutex dismissMutex_;
std::vector<DismissZone> dismissZones_;
};
class OSDOverlayScreen : public UIScreen {