preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

UI screens header cleanup

Browse Source
This commit is contained in:
Henrik Rydgård
2025-10-29 00:15:41 +01:00
parent 69aa84e3b0
commit 2b9f2672bb
55 changed files with 176 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Background.h
+2
View File
@@ -10,3 +10,5 @@ void UIBackgroundInit(UIContext &dc);
void UIBackgroundShutdown();
void DrawGameBackground(UIContext &dc, const Path &gamePath, float x, float y, float z);
void DrawBackground(UIContext &dc, float alpha, float x, float y, float z);
uint32_t GetBackgroundColorWithAlpha(const UIContext &dc);
UI/ControlMappingScreen.cpp
+1
View File
@@ -44,6 +44,7 @@
#include "Core/System.h"
#include "Core/Config.h"
#include "UI/ControlMappingScreen.h"
#include "UI/PopupScreens.h"
#include "UI/GameSettingsScreen.h"
#include "UI/JoystickHistoryView.h"
#include "UI/OnScreenDisplay.h"
UI/ControlMappingScreen.h
+1 -1
View File
@@ -30,7 +30,7 @@
#include "Core/ControlMapper.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
class SingleControlMapper;
UI/CustomButtonMappingScreen.cpp
+1
View File
@@ -21,6 +21,7 @@
#include "Common/UI/Context.h"
#include "Common/UI/View.h"
#include "Common/UI/ViewGroup.h"
#include "Common/UI/ScrollView.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Color/RGBAUtil.h"
UI/CustomButtonMappingScreen.h
+1 -1
View File
@@ -17,7 +17,7 @@
#pragma once
#include "MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/GamepadEmu.h"
namespace UI {
UI/CwCheatScreen.cpp
+1
View File
@@ -25,6 +25,7 @@
#include "Common/StringUtils.h"
#include "Common/System/System.h"
#include "Common/System/Request.h"
#include "Common/UI/PopupScreens.h"
#include "Core/System.h"
#include "Core/Config.h"
#include "Core/CwCheat.h"
UI/CwCheatScreen.h
+1 -1
View File
@@ -23,7 +23,7 @@
#include "Common/UI/View.h"
#include "Common/UI/UIScreen.h"
#include "Common/UI/Context.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
struct CheatFileInfo;
class CWCheatEngine;
UI/DevScreens.cpp
+2 -1
View File
@@ -38,6 +38,7 @@
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Net/HTTPClient.h"
#include "Common/UI/Context.h"
#include "Common/UI/PopupScreens.h"
#include "Common/UI/View.h"
#include "Common/UI/ViewGroup.h"
#include "Common/UI/UI.h"
@@ -65,7 +66,7 @@
#include "GPU/Debugger/Record.h"
#include "GPU/GPUCommon.h"
#include "GPU/GPUState.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/DevScreens.h"
#include "UI/MainScreen.h"
#include "UI/EmuScreen.h"
UI/DevScreens.h
+2 -1
View File
@@ -25,7 +25,8 @@
#include "Common/Net/HTTPClient.h"
#include "Common/UI/UIScreen.h"
#include "UI/TabbedDialogScreen.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/PopupScreens.h"
#include "GPU/Common/ShaderCommon.h"
class DevMenuScreen : public PopupScreen {
UI/DisplayLayoutScreen.cpp
+1
View File
@@ -33,6 +33,7 @@
#include "Common/Data/Color/RGBAUtil.h"
#include "Common/Data/Text/I18n.h"
#include "UI/DisplayLayoutScreen.h"
#include "UI/Background.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
#include "Core/System.h"
UI/DisplayLayoutScreen.h
+2 -2
View File
@@ -21,9 +21,9 @@
#include "Common/UI/View.h"
#include "Common/UI/ViewGroup.h"
#include "Common/UI/PopupScreens.h"
#include "GPU/Common/PostShader.h"
#include "MiscScreens.h"
#include "UI/MiscScreens.h"
namespace UI {
class ChoiceStrip;
UI/DriverManagerScreen.cpp
+4
View File
@@ -1,8 +1,11 @@
#include "Common/File/VFS/ZipFileReader.h"
#include "Common/Data/Format/JSONReader.h"
#include "Common/Data/Text/I18n.h"
#include "Common/System/Request.h"
#include "Common/System/OSD.h"
#include "Common/Log.h"
#include "Common/StringUtils.h"
#include "Common/UI/PopupScreens.h"
#include "Core/Config.h"
#include "Core/System.h"
@@ -11,6 +14,7 @@
#include "UI/DriverManagerScreen.h"
#include "UI/GameSettingsScreen.h" // for triggerrestart
#include "UI/OnScreenDisplay.h"
#include "UI/MiscScreens.h"
static Path GetDriverPath() {
if (g_Config.internalDataDirectory.empty()) {
UI/DriverManagerScreen.h
+1 -1
View File
@@ -3,7 +3,7 @@
#include "ppsspp_config.h"
#include "Common/UI/UIScreen.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/TabbedDialogScreen.h"
// Per-game settings screen - enables you to configure graphic options, control options, etc
UI/EmuScreen.cpp
+2 -1
View File
@@ -84,10 +84,11 @@ using namespace std::placeholders;
#include "UI/GamepadEmu.h"
#include "UI/PauseScreen.h"
#include "UI/MainScreen.h"
#include "UI/Background.h"
#include "UI/EmuScreen.h"
#include "UI/DevScreens.h"
#include "UI/GameInfoCache.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/ControlMappingScreen.h"
#include "UI/DisplayLayoutScreen.h"
#include "UI/GameSettingsScreen.h"
UI/GPUDriverTestScreen.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include "Common/UI/TabHolder.h"
#include "Common/Log.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "Common/GPU/thin3d.h"
class GPUDriverTestScreen : public UIBaseDialogScreen {
UI/GameScreen.cpp
+1
View File
@@ -47,6 +47,7 @@
#include "UI/GameScreen.h"
#include "UI/GameSettingsScreen.h"
#include "UI/GameInfoCache.h"
#include "UI/BaseScreens.h"
#include "UI/MiscScreens.h"
#include "UI/MainScreen.h"
#include "UI/BackgroundAudio.h"
UI/GameScreen.h
+1 -1
View File
@@ -19,7 +19,7 @@
#include <functional>
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "Common/UI/UIScreen.h"
#include "Common/File/Path.h"
UI/GameSettingsScreen.cpp
+1 -1
View File
@@ -40,11 +40,11 @@
#include "Common/Math/curves.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/UI/PopupScreens.h"
#include "UI/EmuScreen.h"
#include "UI/GameSettingsScreen.h"
#include "UI/GameInfoCache.h"
#include "UI/GamepadEmu.h"
#include "UI/MiscScreens.h"
#include "UI/ControlMappingScreen.h"
#include "UI/DevScreens.h"
#include "UI/DeveloperToolsScreen.h"
UI/GameSettingsScreen.h
+2 -1
View File
@@ -23,8 +23,9 @@
#include <thread>
#include "Common/UI/UIScreen.h"
#include "Common/UI/PopupScreens.h"
#include "Core/ConfigValues.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/TabbedDialogScreen.h"
class Path;
UI/IAPScreen.cpp
+5 -3
View File
@@ -1,11 +1,13 @@
// NOTE: This currently only used on iOS, to present the availablility of getting PPSSPP Gold through IAP.
#include "UI/IAPScreen.h"
#include "UI/OnScreenDisplay.h"
#include "UI/MiscScreens.h"
#include "Common/System/System.h"
#include "Common/System/Request.h"
#include "Common/Data/Text/I18n.h"
#include "Common/System/OSD.h"
#include "Common/Render/DrawBuffer.h"
#include "UI/IAPScreen.h"
#include "UI/OnScreenDisplay.h"
#include "UI/MiscViews.h"
void IAPScreen::CreateViews() {
using namespace UI;
UI/IAPScreen.h
+1 -1
View File
@@ -4,7 +4,7 @@
#include "ppsspp_config.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
class IAPScreen : public UIBaseDialogScreen {
public:
UI/InstallZipScreen.h
+1 -1
View File
@@ -24,7 +24,7 @@
#include "Common/UI/View.h"
#include "Common/UI/UIScreen.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
class SavedataView;
UI/JitCompareScreen.cpp
+4 -1
View File
@@ -1,12 +1,15 @@
#include <algorithm>
#include "UI/JitCompareScreen.h"
#include "Common/Data/Text/I18n.h"
#include "Common/UI/ViewGroup.h"
#include "Common/Render/DrawBuffer.h"
#include "Core/MemMap.h"
#include "Core/MIPS/MIPSTables.h"
#include "Core/MIPS/JitCommon/JitBlockCache.h"
#include "Core/MIPS/JitCommon/JitCommon.h"
#include "Core/MIPS/JitCommon/JitState.h"
#include "UI/PopupScreens.h"
JitCompareScreen::JitCompareScreen() : UITabbedBaseDialogScreen(Path()) {
if (!MIPSComp::jit) {
UI/JitCompareScreen.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include "Common/UI/UIScreen.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/TabbedDialogScreen.h"
class JitCompareScreen : public UITabbedBaseDialogScreen {
UI/MainScreen.cpp
+1 -1
View File
@@ -55,7 +55,7 @@
#include "UI/GameScreen.h"
#include "UI/GameInfoCache.h"
#include "UI/GameSettingsScreen.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/ControlMappingScreen.h"
#include "UI/IAPScreen.h"
#include "UI/RemoteISOScreen.h"
UI/MainScreen.h
+1 -1
View File
@@ -24,7 +24,7 @@
#include "Common/UI/UIScreen.h"
#include "Common/UI/ViewGroup.h"
#include "Common/UI/TabHolder.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "Common/File/PathBrowser.h"
enum GameBrowserFlags {
UI/MemStickScreen.cpp
+2 -1
View File
@@ -39,6 +39,7 @@
#include "Common/File/DiskFree.h"
#include "Common/Thread/ThreadManager.h"
#include "Common/UI/ScrollView.h"
#include "Core/Config.h"
#include "Core/Reporting.h"
@@ -48,7 +49,7 @@
#include "UI/MemStickScreen.h"
#include "UI/MainScreen.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/OnScreenDisplay.h"
static std::string FormatSpaceString(int64_t space) {
UI/MemStickScreen.h
+2 -1
View File
@@ -29,7 +29,8 @@
#include "Core/Util/MemStick.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/MiscViews.h"
class NoticeView;
UI/MiscScreens.cpp
-65
View File
@@ -736,68 +736,3 @@ void CreditsScroller::Draw(UIContext &dc) {
dc.Flush();
}
SettingInfoMessage::SettingInfoMessage(int align, float cutOffY, UI::AnchorLayoutParams *lp)
: UI::LinearLayout(ORIENT_HORIZONTAL, lp), cutOffY_(cutOffY) {
using namespace UI;
SetSpacing(0.0f);
Add(new Spacer(10.0f));
text_ = Add(new TextView("", align, false, new LinearLayoutParams(1.0, Margins(0, 10))));
Add(new Spacer(10.0f));
}
void SettingInfoMessage::Show(std::string_view text, const UI::View *refView) {
if (refView) {
Bounds b = refView->GetBounds();
const UI::AnchorLayoutParams *lp = GetLayoutParams()->As<UI::AnchorLayoutParams>();
if (lp) {
if (cutOffY_ != -1.0f && b.y >= cutOffY_) {
ReplaceLayoutParams(new UI::AnchorLayoutParams(lp->width, lp->height, lp->left, 80.0f, lp->right, lp->bottom, lp->center));
} else {
ReplaceLayoutParams(new UI::AnchorLayoutParams(lp->width, lp->height, lp->left, g_display.dp_yres - 80.0f - 40.0f, lp->right, lp->bottom, lp->center));
}
}
}
if (text_) {
text_->SetText(text);
}
timeShown_ = time_now_d();
}
void SettingInfoMessage::Draw(UIContext &dc) {
static const double FADE_TIME = 1.0;
static const float MAX_ALPHA = 0.9f;
// Let's show longer messages for more time (guesstimate at reading speed.)
// Note: this will give multibyte characters more time, but they often have shorter words anyway.
double timeToShow = std::max(1.5, text_->GetText().size() * 0.05);
double sinceShow = time_now_d() - timeShown_;
float alpha = MAX_ALPHA;
if (timeShown_ == 0.0 || sinceShow > timeToShow + FADE_TIME) {
alpha = 0.0f;
} else if (sinceShow > timeToShow) {
alpha = MAX_ALPHA - MAX_ALPHA * (float)((sinceShow - timeToShow) / FADE_TIME);
}
UI::Style style = dc.GetTheme().tooltipStyle;
if (alpha >= 0.001f) {
uint32_t bgColor = alphaMul(style.background.color, alpha);
dc.FillRect(UI::Drawable(bgColor), bounds_);
}
uint32_t textColor = alphaMul(style.fgColor, alpha);
text_->SetTextColor(textColor);
ViewGroup::Draw(dc);
showing_ = sinceShow <= timeToShow; // Don't consider fade time
}
std::string SettingInfoMessage::GetText() const {
return (showing_ && text_) ? text_->GetText() : "";
}
void ShinyIcon::Draw(UIContext &dc) {
UI::DrawIconShine(dc, bounds_, 1.0f, animated_);
UI::ImageView::Draw(dc);
}
UI/MiscScreens.h
-27
View File
@@ -124,30 +124,3 @@ protected:
void CreateViews() override;
const char *tag() const override { return "Credits"; }
};
class SettingInfoMessage : public UI::LinearLayout {
public:
SettingInfoMessage(int align, float cutOffY, UI::AnchorLayoutParams *lp);
void Show(std::string_view text, const UI::View *refView = nullptr);
void Draw(UIContext &dc) override;
std::string GetText() const;
private:
UI::TextView *text_ = nullptr;
double timeShown_ = 0.0;
float cutOffY_;
bool showing_ = false;
};
class ShinyIcon : public UI::ImageView {
public:
ShinyIcon(ImageID atlasImage, UI::LayoutParams *layoutParams = 0) : UI::ImageView(atlasImage, "", UI::IS_DEFAULT, layoutParams) {}
void Draw(UIContext &dc) override;
void SetAnimated(bool anim) { animated_ = anim; }
private:
bool animated_ = true;
};
uint32_t GetBackgroundColorWithAlpha(const UIContext &dc);
UI/MiscViews.cpp
+67
View File
@@ -1,6 +1,9 @@
#include "Common/UI/View.h"
#include "Common/UI/Context.h"
#include "Common/Render/DrawBuffer.h"
#include "Common/System/Request.h"
#include "Common/System/Display.h"
#include "Common/TimeUtil.h"
#include "UI/MiscViews.h"
TextWithImage::TextWithImage(ImageID imageID, std::string_view text, UI::LinearLayoutParams *layoutParams) : UI::LinearLayout(ORIENT_HORIZONTAL, layoutParams) {
@@ -53,3 +56,67 @@ TopBar::TopBar(std::string_view title, UI::LayoutParams *layoutParams) : UI::Lin
Add(new Spacer(50.0f));
}
}
SettingInfoMessage::SettingInfoMessage(int align, float cutOffY, UI::AnchorLayoutParams *lp)
: UI::LinearLayout(ORIENT_HORIZONTAL, lp), cutOffY_(cutOffY) {
using namespace UI;
SetSpacing(0.0f);
Add(new Spacer(10.0f));
text_ = Add(new TextView("", align, false, new LinearLayoutParams(1.0, Margins(0, 10))));
Add(new Spacer(10.0f));
}
void SettingInfoMessage::Show(std::string_view text, const UI::View *refView) {
if (refView) {
Bounds b = refView->GetBounds();
const UI::AnchorLayoutParams *lp = GetLayoutParams()->As<UI::AnchorLayoutParams>();
if (lp) {
if (cutOffY_ != -1.0f && b.y >= cutOffY_) {
ReplaceLayoutParams(new UI::AnchorLayoutParams(lp->width, lp->height, lp->left, 80.0f, lp->right, lp->bottom, lp->center));
} else {
ReplaceLayoutParams(new UI::AnchorLayoutParams(lp->width, lp->height, lp->left, g_display.dp_yres - 80.0f - 40.0f, lp->right, lp->bottom, lp->center));
}
}
}
if (text_) {
text_->SetText(text);
}
timeShown_ = time_now_d();
}
void SettingInfoMessage::Draw(UIContext &dc) {
static const double FADE_TIME = 1.0;
static const float MAX_ALPHA = 0.9f;
// Let's show longer messages for more time (guesstimate at reading speed.)
// Note: this will give multibyte characters more time, but they often have shorter words anyway.
double timeToShow = std::max(1.5, text_->GetText().size() * 0.05);
double sinceShow = time_now_d() - timeShown_;
float alpha = MAX_ALPHA;
if (timeShown_ == 0.0 || sinceShow > timeToShow + FADE_TIME) {
alpha = 0.0f;
} else if (sinceShow > timeToShow) {
alpha = MAX_ALPHA - MAX_ALPHA * (float)((sinceShow - timeToShow) / FADE_TIME);
}
UI::Style style = dc.GetTheme().tooltipStyle;
if (alpha >= 0.001f) {
uint32_t bgColor = alphaMul(style.background.color, alpha);
dc.FillRect(UI::Drawable(bgColor), bounds_);
}
uint32_t textColor = alphaMul(style.fgColor, alpha);
text_->SetTextColor(textColor);
ViewGroup::Draw(dc);
showing_ = sinceShow <= timeToShow; // Don't consider fade time
}
std::string SettingInfoMessage::GetText() const {
return (showing_ && text_) ? text_->GetText() : "";
}
void ShinyIcon::Draw(UIContext &dc) {
UI::DrawIconShine(dc, bounds_, 1.0f, animated_);
UI::ImageView::Draw(dc);
}
UI/MiscViews.h
+25
View File
@@ -22,3 +22,28 @@ public:
private:
UI::Choice *backButton_ = nullptr;
};
class SettingInfoMessage : public UI::LinearLayout {
public:
SettingInfoMessage(int align, float cutOffY, UI::AnchorLayoutParams *lp);
void Show(std::string_view text, const UI::View *refView = nullptr);
void Draw(UIContext &dc) override;
std::string GetText() const;
private:
UI::TextView *text_ = nullptr;
double timeShown_ = 0.0;
float cutOffY_;
bool showing_ = false;
};
class ShinyIcon : public UI::ImageView {
public:
ShinyIcon(ImageID atlasImage, UI::LayoutParams *layoutParams = 0) : UI::ImageView(atlasImage, "", UI::IS_DEFAULT, layoutParams) {}
void Draw(UIContext &dc) override;
void SetAnimated(bool anim) { animated_ = anim; }
private:
bool animated_ = true;
};
UI/NativeApp.cpp
+1
View File
@@ -87,6 +87,7 @@
#include "Common/VR/PPSSPPVR.h"
#include "Common/Thread/ThreadManager.h"
#include "Common/Audio/AudioBackend.h"
#include "Common/UI/PopupScreens.h"
#include "Core/ControlMapper.h"
#include "Core/Config.h"
#include "Core/ConfigValues.h"
UI/PauseScreen.h
+1 -1
View File
@@ -23,7 +23,7 @@
#include "Common/File/Path.h"
#include "Common/UI/UIScreen.h"
#include "Common/UI/ViewGroup.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/Screen.h"
class GamePauseScreen : public UIBaseDialogScreen {
UI/RemoteISOScreen.cpp
+1
View File
@@ -35,6 +35,7 @@
#include "Common/System/Request.h"
#include "Common/File/PathBrowser.h"
#include "Common/UI/PopupScreens.h"
#include "Common/Data/Format/JSONReader.h"
#include "Common/Data/Text/I18n.h"
#include "Common/Common.h"
UI/RemoteISOScreen.h
+1 -1
View File
@@ -22,7 +22,7 @@
#include "Common/UI/UIScreen.h"
#include "Common/UI/ViewGroup.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/MainScreen.h"
#include "UI/TabbedDialogScreen.h"
UI/ReportScreen.cpp
+3 -3
View File
@@ -22,9 +22,7 @@
#include "Common/GPU/thin3d.h"
#include "Common/UI/AsyncImageFileView.h"
#include "Common/UI/Context.h"
#include "UI/PauseScreen.h"
#include "UI/ReportScreen.h"
#include "Common/UI/ScrollView.h"
#include "Common/Data/Text/I18n.h"
#include "Common/File/FileUtil.h"
#include "Common/Log.h"
@@ -36,6 +34,8 @@
#include "Core/Reporting.h"
#include "Core/Screenshot.h"
#include "Core/System.h"
#include "UI/PauseScreen.h"
#include "UI/ReportScreen.h"
using namespace UI;
UI/ReportScreen.h
+1 -1
View File
@@ -21,7 +21,7 @@
#include "Common/UI/UIScreen.h"
#include "Common/UI/ViewGroup.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "Common/File/Path.h"
enum class ReportingOverallScore : int {
UI/RetroAchievementScreens.cpp
+2 -1
View File
@@ -1,11 +1,12 @@
#include "Common/Data/Text/I18n.h"
#include "Common/System/OSD.h"
#include "Common/System/Request.h"
#include "Common/UI/View.h"
#include "Common/UI/ViewGroup.h"
#include "Common/UI/TabHolder.h"
#include "Common/UI/Context.h"
#include "Common/Data/Text/I18n.h"
#include "Common/UI/IconCache.h"
#include "Common/UI/PopupScreens.h"
#include "Common/StringUtils.h"
#include "Core/Config.h"
UI/RetroAchievementScreens.h
+1 -1
View File
@@ -7,7 +7,7 @@
#include "Common/UI/UIScreen.h"
#include "Common/UI/ViewGroup.h"
#include "Core/RetroAchievements.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/TabbedDialogScreen.h"
#include "ext/rcheevos/include/rc_client.h"
UI/SavedataScreen.cpp
+1 -1
View File
@@ -26,7 +26,6 @@
#include "Common/Data/Text/Parsers.h"
#include "Common/System/NativeApp.h"
#include "Common/System/Request.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/UI/Context.h"
#include "Common/UI/View.h"
#include "Common/UI/ViewGroup.h"
@@ -35,6 +34,7 @@
#include "UI/MainScreen.h"
#include "UI/GameInfoCache.h"
#include "UI/PauseScreen.h"
#include "UI/MiscScreens.h"
#include "Common/File/FileUtil.h"
#include "Common/TimeUtil.h"
UI/SavedataScreen.h
+1 -1
View File
@@ -26,7 +26,7 @@
#include "Common/UI/View.h"
#include "Common/UI/ViewGroup.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/GameInfoCache.h"
#include "UI/TabbedDialogScreen.h"
UI/Store.cpp
+1
View File
@@ -21,6 +21,7 @@
#include "Common/UI/Context.h"
#include "Common/UI/ViewGroup.h"
#include "Common/UI/IconCache.h"
#include "Common/UI/ScrollView.h"
#include "Common/Render/DrawBuffer.h"
#include "Common/Log.h"
UI/Store.h
+1 -1
View File
@@ -23,7 +23,7 @@
#include "Common/UI/ViewGroup.h"
#include "Common/Net/HTTPClient.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
// Game screen: Allows you to start a game, delete saves, delete the game,
// set game specific settings, etc.
UI/SystemInfoScreen.cpp
+2 -1
View File
@@ -16,13 +16,14 @@
#include "Common/Data/Text/Parsers.h"
#include "Common/Data/Encoding/Utf8.h"
#include "Common/Render/Text/draw_text.h"
#include "Common/System/Request.h"
#include "Common/UI/Context.h"
#include "Core/System.h"
#include "Core/Config.h"
#include "GPU/GPUState.h" // ugh
#include "UI/SystemInfoScreen.h"
#include "UI/IconCache.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/OnScreenDisplay.h"
#include "android/jni/app-android.h"
UI/TabbedDialogScreen.cpp
+6
View File
@@ -1,16 +1,22 @@
#include <algorithm>
#include "Common/Data/Text/I18n.h"
#include "Common/StringUtils.h"
#include "Common/System/NativeApp.h"
#include "Common/System/Request.h"
#include "Common/System/Display.h"
#include "Common/UI/TabHolder.h"
#include "Common/UI/ViewGroup.h"
#include "Common/UI/ScrollView.h"
#include "Common/UI/PopupScreens.h"
#include "UI/MiscViews.h"
#include "UI/TabbedDialogScreen.h"
void UITabbedBaseDialogScreen::AddTab(const char *tag, std::string_view title, std::function<void(UI::LinearLayout *)> createCallback, TabFlags flags) {
using namespace UI;
tabHolder_->AddTabDeferred(title, [createCallback = std::move(createCallback), tag, flags]() -> UI::ViewGroup * {
using namespace UI;
ViewGroup *scroll = nullptr;
if (!(flags & TabFlags::NonScrollable)) {
scroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
UI/TabbedDialogScreen.h
+3 -1
View File
@@ -6,7 +6,9 @@
#include "Common/UI/UIScreen.h"
#include "Common/System/System.h"
#include "Core/ConfigValues.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
class SettingInfoMessage;
namespace UI {
class TabHolder;
UI/TiltAnalogSettingsScreen.cpp
+2
View File
@@ -23,6 +23,8 @@
#include "Common/Math/math_util.h"
#include "Common/Log.h"
#include "Common/Data/Text/I18n.h"
#include "Common/UI/ScrollView.h"
#include "Common/UI/PopupScreens.h"
#include "UI/JoystickHistoryView.h"
#include "UI/GamepadEmu.h"
UI/TiltAnalogSettingsScreen.h
+1 -1
View File
@@ -19,7 +19,7 @@
#include "Common/Math/math_util.h"
#include "Common/UI/View.h"
#include "MiscScreens.h"
#include "BaseScreens.h"
class JoystickHistoryView;
class GamepadView;
UI/TouchControlLayoutScreen.cpp
+1
View File
@@ -24,6 +24,7 @@
#include "Common/Math/math_util.h"
#include "Common/System/Display.h"
#include "Common/UI/Context.h"
#include "Common/UI/PopupScreens.h"
#include "Common/CommonTypes.h"
#include "Common/Log.h"
UI/TouchControlLayoutScreen.h
+1 -1
View File
@@ -20,7 +20,7 @@
#include "Common/UI/View.h"
#include "Common/UI/ViewGroup.h"
#include "Common/UI/TabHolder.h"
#include "MiscScreens.h"
#include "BaseScreens.h"
class ControlLayoutView;
UI/TouchControlVisibilityScreen.cpp
+2 -1
View File
@@ -15,11 +15,12 @@
// Official git repository and contact information can be found at
// https://github.com/hrydgard/ppsspp and http://www.ppsspp.org/.
#include "Common/UI/TabHolder.h"
#include "Common/System/Display.h"
#include "Common/Render/TextureAtlas.h"
#include "Common/Data/Text/I18n.h"
#include "Common/StringUtils.h"
#include "Common/UI/TabHolder.h"
#include "Common/UI/PopupScreens.h"
#include "Core/Config.h"
UI/TouchControlVisibilityScreen.h
+3 -1
View File
@@ -17,8 +17,10 @@
#pragma once
#include <vector>
#include <string>
#include "Common/Render/TextureAtlas.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "UI/TabbedDialogScreen.h"
namespace UI {
UI/UploadScreen.cpp
+1
View File
@@ -4,6 +4,7 @@
#include "Common/File/DiskFree.h"
#include "Common/StringUtils.h"
#include "Common/Data/Text/Parsers.h"
#include "Common/Data/Text/I18n.h"
#include "Core/WebServer.h"
#include "UI/UploadScreen.h"
#include "UI/MiscViews.h"
UI/UploadScreen.h
+1 -1
View File
@@ -25,7 +25,7 @@
#include "Common/UI/UIScreen.h"
#include "Common/UI/ViewGroup.h"
#include "UI/MiscScreens.h"
#include "UI/BaseScreens.h"
#include "Common/TimeUtil.h"
// Upload screen: Shows the user an ip address to go to in a web browser on the same network,