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

Keep only the LUT addition

Browse Source
This commit is contained in:
Giovanni Cocco 2024-09-26 19:15:17 +02:00
parent bff850dadd
commit 931eafd565
6 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Common/UI/PopupScreens.cpp
View File

@ -10,7 +10,6 @@
#include "Common/Data/Text/I18n.h" #include "Common/Data/Text/I18n.h"
#include "Common/System/System.h" #include "Common/System/System.h"
#include "Common/System/Request.h" #include "Common/System/Request.h"
#include "Core/ConfigSettings.h"
namespace UI { namespace UI {
@ -200,14 +199,6 @@ void PopupSliderChoiceFloat::SetFormat(std::string_view fmt) {
} }
} }
bool PopupSliderChoiceFloat::perGame() const {
return ConfigSetting::perGame(value_);
}
bool PopupSliderChoice::perGame() const {
return ConfigSetting::perGame(value_);
}
EventReturn PopupSliderChoice::HandleClick(EventParams &e) { EventReturn PopupSliderChoice::HandleClick(EventParams &e) {
restoreFocus_ = HasFocus(); restoreFocus_ = HasFocus();
@ -653,13 +644,7 @@ void AbstractChoiceWithValueDisplay::Draw(UIContext &dc) {
dc.MeasureTextRect(dc.theme->uiFont, scale, scale, valueText, availBounds, &w, &h, ALIGN_RIGHT | ALIGN_VCENTER | FLAG_WRAP_TEXT); dc.MeasureTextRect(dc.theme->uiFont, scale, scale, valueText, availBounds, &w, &h, ALIGN_RIGHT | ALIGN_VCENTER | FLAG_WRAP_TEXT);
textPadding_.right = w + paddingX; textPadding_.right = w + paddingX;
if (perGame()) {
textPadding_.left = 30;
}
Choice::Draw(dc); Choice::Draw(dc);
if (perGame()) {
dc.Draw()->DrawImage(ImageID("I_GEAR"), bounds_.x + 22, bounds_.centerY(), 1.0f, style.fgColor, ALIGN_CENTER);
}
int imagePadding = 0; int imagePadding = 0;
if (rightIconImage_.isValid()) { if (rightIconImage_.isValid()) {
imagePadding = bounds_.h; imagePadding = bounds_.h;

2
Common/UI/PopupScreens.h
View File

@ -297,7 +297,6 @@ public:
protected: protected:
std::string ValueText() const override; std::string ValueText() const override;
bool perGame() const override;
private: private:
EventReturn HandleClick(EventParams &e); EventReturn HandleClick(EventParams &e);
@ -336,7 +335,6 @@ public:
protected: protected:
std::string ValueText() const override; std::string ValueText() const override;
bool perGame() const override;
private: private:
EventReturn HandleClick(EventParams &e); EventReturn HandleClick(EventParams &e);

5
Common/UI/View.cpp
View File

@ -18,7 +18,6 @@
#include "Common/TimeUtil.h" #include "Common/TimeUtil.h"
#include "Common/StringUtils.h" #include "Common/StringUtils.h"
#include "Common/Log.h" #include "Common/Log.h"
#include "Core/ConfigSettings.h"
namespace UI { namespace UI {
@ -799,10 +798,6 @@ void CheckBox::Draw(UIContext &dc) {
if (!text_.empty()) { if (!text_.empty()) {
Bounds textBounds(bounds_.x + paddingX, bounds_.y, availWidth, bounds_.h); Bounds textBounds(bounds_.x + paddingX, bounds_.y, availWidth, bounds_.h);
if (ConfigSetting::perGame(toggle_)) {
dc.Draw()->DrawImage(ImageID("I_GEAR"), bounds_.x + 22, bounds_.centerY(), 1.0f, style.fgColor, ALIGN_CENTER);
textBounds.x += 30;
}
dc.DrawTextRectSqueeze(text_, textBounds, style.fgColor, ALIGN_VCENTER | FLAG_WRAP_TEXT); dc.DrawTextRectSqueeze(text_, textBounds, style.fgColor, ALIGN_VCENTER | FLAG_WRAP_TEXT);
} }
dc.Draw()->DrawImage(image, bounds_.x2() - paddingX, bounds_.centerY(), 1.0f, style.fgColor, ALIGN_RIGHT | ALIGN_VCENTER); dc.Draw()->DrawImage(image, bounds_.x2() - paddingX, bounds_.centerY(), 1.0f, style.fgColor, ALIGN_RIGHT | ALIGN_VCENTER);

1
Common/UI/View.h
View File

@ -829,7 +829,6 @@ public:
} }
protected: protected:
virtual std::string ValueText() const = 0; virtual std::string ValueText() const = 0;
virtual bool perGame() const { return false; }
float CalculateValueScale(const UIContext &dc, std::string_view valueText, float availWidth) const; float CalculateValueScale(const UIContext &dc, std::string_view valueText, float availWidth) const;

2
Core/ConfigSettings.cpp
View File

@ -12,7 +12,7 @@ std::unordered_map<void*, ConfigSetting*>& ConfigSetting::getPtrLUT() {
} }
bool ConfigSetting::perGame(void *ptr) { bool ConfigSetting::perGame(void *ptr) {
return g_Config.bGameSpecific && ConfigSetting::getPtrLUT().count(ptr) > 0 && ConfigSetting::getPtrLUT()[ptr]->PerGame(); return g_Config.bGameSpecific && getPtrLUT().count(ptr) > 0 && getPtrLUT()[ptr]->PerGame();
} }
bool ConfigSetting::Get(const Section *section) const { bool ConfigSetting::Get(const Section *section) const {

1
Core/ConfigSettings.h
View File

@ -227,6 +227,7 @@ struct ConfigSetting {
const Type type_; const Type type_;
// Returns false if per-game settings are not currently used
static bool perGame(void *ptr); static bool perGame(void *ptr);
private: private: