Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove modifyLock_ from ViewGroup

Browse source
This commit is contained in:
Henrik Rydgård 2023-11-11 11:25:41 +01:00
parent d4833b72b1
commit 5146a2a967
2 changed files with 0 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Common/UI/ViewGroup.cpp
View file

@ -48,7 +48,6 @@ ViewGroup::~ViewGroup() {
}
void ViewGroup::RemoveSubview(View *subView) {
std::lock_guard<std::mutex> guard(modifyLock_);
// loop counter needed, so can't convert loop.
for (size_t i = 0; i < views_.size(); i++) {
if (views_[i] == subView) {
@ -68,7 +67,6 @@ bool ViewGroup::ContainsSubview(const View *view) const {
}
void ViewGroup::Clear() {
std::lock_guard<std::mutex> guard(modifyLock_);
for (View *view : views_) {
delete view;
}
@ -76,8 +74,6 @@ void ViewGroup::Clear() {
}
void ViewGroup::PersistData(PersistStatus status, std::string anonId, PersistMap &storage) {
std::lock_guard<std::mutex> guard(modifyLock_);
std::string tag = Tag();
if (tag.empty()) {
tag = anonId;
@ -89,7 +85,6 @@ void ViewGroup::PersistData(PersistStatus status, std::string anonId, PersistMap
}
bool ViewGroup::Touch(const TouchInput &input) {
std::lock_guard<std::mutex> guard(modifyLock_);
bool any = false;
for (View *view : views_) {
// TODO: If there is a transformation active, transform input coordinates accordingly.
@ -118,7 +113,6 @@ void ViewGroup::Query(float x, float y, std::vector<View *> &list) {
}
bool ViewGroup::Key(const KeyInput &input) {
std::lock_guard<std::mutex> guard(modifyLock_);
bool ret = false;
for (View *view : views_) {
// TODO: If there is a transformation active, transform input coordinates accordingly.
@ -129,7 +123,6 @@ bool ViewGroup::Key(const KeyInput &input) {
}
void ViewGroup::Axis(const AxisInput &input) {
std::lock_guard<std::mutex> guard(modifyLock_);
for (View *view : views_) {
// TODO: If there is a transformation active, transform input coordinates accordingly.
if (view->GetVisibility() == V_VISIBLE)
@ -138,14 +131,12 @@ void ViewGroup::Axis(const AxisInput &input) {
}
void ViewGroup::DeviceLost() {
std::lock_guard<std::mutex> guard(modifyLock_);
for (View *view : views_) {
view->DeviceLost();
}
}
void ViewGroup::DeviceRestored(Draw::DrawContext *draw) {
std::lock_guard<std::mutex> guard(modifyLock_);
for (View *view : views_) {
view->DeviceRestored(draw);
}
@ -245,7 +236,6 @@ void ViewGroup::Update() {
}
bool ViewGroup::SetFocus() {
std::lock_guard<std::mutex> guard(modifyLock_);
if (!CanBeFocused() && !views_.empty()) {
for (View *view : views_) {
if (view->SetFocus())

5
Common/UI/ViewGroup.h
View file

@ -45,7 +45,6 @@ public:
// Takes ownership! DO NOT add a view to multiple parents!
template <class T>
T *Add(T *view) {
std::lock_guard<std::mutex> guard(modifyLock_);
views_.push_back(view);
return view;
}
@ -76,9 +75,6 @@ public:
void SetExclusiveTouch(bool exclusive) { exclusiveTouch_ = exclusive; }
void SetClickableBackground(bool clickableBackground) { clickableBackground_ = clickableBackground; }
void Lock() { modifyLock_.lock(); }
void Unlock() { modifyLock_.unlock(); }
void SetClip(bool clip) { clip_ = clip; }
std::string DescribeLog() const override { return "ViewGroup: " + View::DescribeLog(); }
std::string DescribeText() const override;
@ -87,7 +83,6 @@ protected:
std::string DescribeListUnordered(const char *heading) const;
std::string DescribeListOrdered(const char *heading) const;
std::mutex modifyLock_; // Hold this when changing the subviews.
std::vector<View *> views_;
View *defaultFocusView_ = nullptr;
Drawable bg_;