Merge pull request #19426 from hrydgard/store-update-2

Additional store UI update

Author: hrydgard

Common/UI/View.cpp

@@ -1043,7 +1043,13 @@ void TextView::GetContentDimensionsBySpec(const UIContext &dc, MeasureSpec horiz
 	if (bullet_) {
 		bounds.w -= bulletOffset;
 	}
-	dc.MeasureTextRect(small_ ? dc.theme->uiFontSmall : dc.theme->uiFont, 1.0f, 1.0f, text_, bounds, &w, &h, textAlign_);
+	const FontStyle *style = &dc.theme->uiFont;
+	if (small_) {
+		style = &dc.theme->uiFontSmall;
+	} else if (big_) {
+		style = &dc.theme->uiFontBig;
+	}
+	dc.MeasureTextRect(*style, 1.0f, 1.0f, text_, bounds, &w, &h, textAlign_);
 	w += pad_ * 2.0f;
 	h += pad_ * 2.0f;
 	if (bullet_) {
@@ -1074,7 +1080,13 @@ void TextView::Draw(UIContext &dc) {
 		style.background.color &= 0x7fffffff;
 		dc.FillRect(style.background, bounds_);
 	}
-	dc.SetFontStyle(small_ ? dc.theme->uiFontSmall : dc.theme->uiFont);
+	const FontStyle *style = &dc.theme->uiFont;
+	if (small_) {
+		style = &dc.theme->uiFontSmall;
+	} else if (big_) {
+		style = &dc.theme->uiFontBig;
+	}
+	dc.SetFontStyle(*style);
 
 	Bounds textBounds = bounds_;
 
@@ -1094,7 +1106,7 @@ void TextView::Draw(UIContext &dc) {
 		dc.DrawTextRect(text_, textBounds.Offset(1.0f + pad_, 1.0f + pad_), shadowColor, textAlign_);
 	}
 	dc.DrawTextRect(text_, textBounds.Offset(pad_, pad_), textColor, textAlign_);
-	if (small_) {
+	if (small_ || big_) {
 		// If we changed font style, reset it.
 		dc.SetFontStyle(dc.theme->uiFont);
 	}

Common/UI/View.h

@@ -93,7 +93,7 @@ struct FontStyle {
 struct Theme {
 	FontStyle uiFont;
 	FontStyle uiFontSmall;
-	FontStyle uiFontSmaller;
+	FontStyle uiFontBig;
 
 	ImageID checkOn;
 	ImageID checkOff;
@@ -982,10 +982,10 @@ class BorderView : public InertView {
 class TextView : public InertView {
 public:
 	TextView(std::string_view text, LayoutParams *layoutParams = 0)
-		: InertView(layoutParams), text_(text), textAlign_(0), textColor_(0xFFFFFFFF), small_(false), shadow_(false), focusable_(false), clip_(true) {}
+		: InertView(layoutParams), text_(text), textAlign_(0), textColor_(0xFFFFFFFF), small_(false) {}
 
 	TextView(std::string_view text, int textAlign, bool small, LayoutParams *layoutParams = 0)
-		: InertView(layoutParams), text_(text), textAlign_(textAlign), textColor_(0xFFFFFFFF), small_(small), shadow_(false), focusable_(false), clip_(true) {}
+		: InertView(layoutParams), text_(text), textAlign_(textAlign), textColor_(0xFFFFFFFF), small_(small) {}
 
 	void GetContentDimensionsBySpec(const UIContext &dc, MeasureSpec horiz, MeasureSpec vert, float &w, float &h) const override;
 	void Draw(UIContext &dc) override;
@@ -994,6 +994,7 @@ class TextView : public InertView {
 	const std::string &GetText() const { return text_; }
 	std::string DescribeText() const override { return GetText(); }
 	void SetSmall(bool small) { small_ = small; }
+	void SetBig(bool big) { big_ = big; }
 	void SetTextColor(uint32_t color) { textColor_ = color; hasTextColor_ = true; }
 	void SetShadow(bool shadow) { shadow_ = shadow; }
 	void SetFocusable(bool focusable) { focusable_ = focusable; }
@@ -1009,9 +1010,10 @@ class TextView : public InertView {
 	uint32_t textColor_;
 	bool hasTextColor_ = false;
 	bool small_;
-	bool shadow_;
-	bool focusable_;
-	bool clip_;
+	bool big_ = false;
+	bool shadow_ = false;
+	bool focusable_ = false;
+	bool clip_ = true;
 	bool bullet_ = false;
 	float pad_ = 0.0f;
 };

UI/Store.cpp

@@ -288,7 +288,7 @@ void ProductView::CreateViews() {
 	if (!entry_.iconURL.empty()) {
 		Add(new HttpImageFileView(&g_DownloadManager, ResolveUrl(StoreBaseUrl(), entry_.iconURL), IS_FIXED))->SetFixedSize(144, 88);
 	}
-	Add(new TextView(entry_.name));
+	Add(new TextView(entry_.name))->SetBig(true);
 	Add(new TextView(entry_.author));
 
 	auto st = GetI18NCategory(I18NCat::STORE);
@@ -313,7 +313,7 @@ void ProductView::CreateViews() {
 			g_GameManager.UninstallGameOnThread(entry_.file);
 			return UI::EVENT_DONE;
 		});
-		Add(new TextView(st->T("Installed")));
+		// Add(new TextView(st->T("Installed")));  // Not really needed
 	}
 
 	cancelButton_ = Add(new Button(di->T("Cancel")));
@@ -334,8 +334,8 @@ void ProductView::CreateViews() {
 
 	if (!entry_.license.empty()) {
 		LinearLayout *horiz = Add(new LinearLayout(ORIENT_HORIZONTAL));
-		horiz->Add(new TextView(StringFromFormat("%s: %s", st->T_cstr("License"), entry_.license.c_str())));
-		horiz->Add(new Button(st->T("Details")))->OnClick.Add([this](UI::EventParams) {
+		horiz->Add(new TextView(StringFromFormat("%s: %s", st->T_cstr("License"), entry_.license.c_str()), new LinearLayoutParams(0.0, G_VCENTER)));
+		horiz->Add(new Button(di->T("More information..."), new LinearLayoutParams(0.0, G_VCENTER)))->OnClick.Add([this](UI::EventParams) {
 			std::string url = StringFromFormat("https://www.ppsspp.org/docs/reference/homebrew-store-distribution/#%s", entry_.file.c_str());
 			System_LaunchUrl(LaunchUrlType::BROWSER_URL, url.c_str());
 			return UI::EVENT_DONE;

UI/Theme.cpp

@@ -197,11 +197,11 @@ void UpdateTheme(UIContext *ctx) {
 #if defined(USING_WIN_UI) || PPSSPP_PLATFORM(UWP) || defined(USING_QT_UI)
 	ui_theme.uiFont = UI::FontStyle(FontID("UBUNTU24"), g_Config.sFont.c_str(), 22);
 	ui_theme.uiFontSmall = UI::FontStyle(FontID("UBUNTU24"), g_Config.sFont.c_str(), 17);
-	ui_theme.uiFontSmaller = UI::FontStyle(FontID("UBUNTU24"), g_Config.sFont.c_str(), 13);
+	ui_theme.uiFontBig = UI::FontStyle(FontID("UBUNTU24"), g_Config.sFont.c_str(), 28);
 #else
 	ui_theme.uiFont = UI::FontStyle(FontID("UBUNTU24"), "", 20);
 	ui_theme.uiFontSmall = UI::FontStyle(FontID("UBUNTU24"), "", 15);
-	ui_theme.uiFontSmaller = UI::FontStyle(FontID("UBUNTU24"), "", 12);
+	ui_theme.uiFontBig = UI::FontStyle(FontID("UBUNTU24"), "", 26);
 #endif
 
 	ui_theme.checkOn = ImageID("I_CHECKEDBOX");

assets/lang/ar_AE.ini

@@ -1180,10 +1180,10 @@ Search term = Search term
 
 [Store]
 Connection Error = ‎خطأ في الإتصال
-Details = Details
 Install = ‎تثبيت
 Installed = ‎مثبتة بالفعل
 Launch Game = ‎إبدء اللعبة
+License = License
 Loading... = ‎تحميل...
 MB = ‎ميجا
 Size = ‎الحجم

assets/lang/az_AZ.ini

@@ -1172,10 +1172,10 @@ Search term = Search term
 
 [Store]
 Connection Error = Connection error
-Details = Details
 Install = Install
 Installed = Installed
 Launch Game = Launch game
+License = License
 Loading... = Loading...
 MB = MB
 Size = Size

assets/lang/bg_BG.ini

@@ -1172,10 +1172,10 @@ Search term = Search term
 
 [Store]
 Connection Error = Грешка при свързването
-Details = Details
 Install = Инсталирай
 Installed = Вече е инсталирано
 Launch Game = Launch game
+License = License
 Loading... = Зареждане...
 MB = MB
 Size = Големина

assets/lang/ca_ES.ini

@@ -1172,10 +1172,10 @@ Search term = Search term
 
 [Store]
 Connection Error = Error de connexió
-Details = Details
 Install = Instal·lar
 Installed = Ja instal·lat
 Launch Game = Iniciar joc
+License = License
 Loading... = Carregant...
 MB = MB
 Size = Mida

assets/lang/cz_CZ.ini

@@ -1172,10 +1172,10 @@ Search term = Search term
 
 [Store]
 Connection Error = Chyba připojení
-Details = Details
 Install = Nainstalovat
 Installed = Již instalováno
 Launch Game = Spustit hru
+License = License
 Loading... = Načítání...
 MB = MB
 Size = Velikost

assets/lang/da_DK.ini

@@ -1172,10 +1172,10 @@ Search term = Search term
 
 [Store]
 Connection Error = Forbindelsesfejl
-Details = Details
 Install = Installer
 Installed = Allerede installeret
 Launch Game = Start spil
+License = License
 Loading... = Henter...
 MB = MB
 Size = Størrelse

assets/lang/de_DE.ini

@@ -1172,10 +1172,10 @@ Search term = Suchbegriff
 
 [Store]
 Connection Error = Verbindungsfehler
-Details = Details
 Install = Installieren
 Installed = Bereits installiert
 Launch Game = Spiel starten
+License = License
 Loading... = Lade...
 MB = MB
 Size = Größe

assets/lang/dr_ID.ini

@@ -1172,10 +1172,10 @@ Search term = Search term
 
 [Store]
 Connection Error = Connection error
-Details = Details
 Install = Install
 Installed = Installed
 Launch Game = Launch game
+License = License
 Loading... = Loading...
 MB = MB
 Size = Size

assets/lang/en_US.ini

@@ -1188,10 +1188,10 @@ Untitled PSP game = Untitled PSP game
 
 [Store]
 Connection Error = Connection error
-Details = Details
 Install = Install
 Installed = Installed
 Launch Game = Launch game
+License = License
 Loading... = Loading...
 MB = MB
 Size = Size

assets/lang/es_ES.ini

@@ -1173,15 +1173,15 @@ Search term = Buscar término
 
 [Store]
 Connection Error = Error de conexión
-Details = Details
 Install = Instalar
 Installed = Ya instalado
 Launch Game = Iniciar juego
+License = Licencia
 Loading... = Cargando...
 MB = MB
 Size = Tamaño
 Uninstall = Desinstalar
-Website = Website
+Website = Sitio web
 
 [SysInfo]
 %0.2f Hz = %0.2f Hz

assets/lang/es_LA.ini

@@ -37,7 +37,7 @@ Locked achievements = Logros bloqueados
 Log bad memory accesses = Registrar malos accesos a la memoría
 Mastered %1 = Completaste %1
 Notifications = Notificaciones
-Recently unlocked achievements = Logros recientemente desbloqueados 
+Recently unlocked achievements = Logros recientemente desbloqueados
 Reconnected to RetroAchievements. = Reconectado a RetroAchievements.
 Register on www.retroachievements.org = Registrate en www.retroachievements.org
 RetroAchievements are not available for this game = RetroAchievements no están disponibles para este juego
@@ -99,7 +99,7 @@ Calibrate Analog Stick = Calibrar análogo
 Calibrate = Calibrar
 Calibrated = Calibrado
 Calibration = Calibración
-Circular deadzone = Circular deadzone o Zona Inactiva circular 
+Circular deadzone = Circular deadzone o Zona Inactiva circular
 Circular stick input = Entrada del stick circular
 Classic = Clásico
 Confine Mouse = Fijar el ratón al área de la ventana/pantalla
@@ -321,7 +321,7 @@ Log Dropped Frame Statistics = Registrar estadísticas de frames caídos
 Log Level = Nivel de registro
 Log View = Ver el registro
 Logging Channels = Canales de registro
-Multi-threaded rendering = Renderización Multi-threaded 
+Multi-threaded rendering = Renderización Multi-threaded
 Next = Siguiente
 No block = No bloquear
 Off = Off
@@ -716,7 +716,7 @@ Autoconfigure = Autoconfigurar
 Autoconfigure for device = Autoconfigurar para dispositivo
 Bind All = Ocultar todo
 Clear All = Borrar todo
-Combo mappings are not enabled = Las asignaciones combinadas o combo mappings no están habilitadas 
+Combo mappings are not enabled = Las asignaciones combinadas o combo mappings no están habilitadas
 Control modifiers = Control modifiers
 Default All = Restaurar
 Emulator controls = Emulator controls
@@ -1110,7 +1110,7 @@ Perfect Description = Perfecta emulación para este juego.
 Plays = Jugable
 Plays Description = Perfecta jugabilidad pero puede tener glitches.
 ReportButton = Informar de error
-Show disc CRC = Mostrar CRC del disco 
+Show disc CRC = Mostrar CRC del disco
 Speed = Velocidad
 Submit Feedback = Enviar comentario
 SuggestionConfig = Ver reportes en la web para una buena configuración.
@@ -1174,15 +1174,15 @@ Search term = Buscar termino
 
 [Store]
 Connection Error = Error de conexión
-Details = Details
 Install = Instalar
 Installed = Ya instalado
 Launch Game = Lanzar juego
+License = Licencia
 Loading... = Cargando...
 MB = MB
 Size = Tamaño
 Uninstall = Desinstalar
-Website = Website
+Website = Sitio web
 
 [SysInfo]
 %0.2f Hz = %0.2f Hz
@@ -1397,7 +1397,7 @@ Default = Por defecto
 [UI Elements]
 %1 button = %1 botón
 %1 checkbox = %1 checkbox
-%1 choice = %1 elección 
+%1 choice = %1 elección
 %1 heading = %1 Encabezado o título
 %1 radio button = %1 radio button
 %1 text field = %1 campo de texto
@@ -1413,7 +1413,7 @@ New version of PPSSPP available = Nueva versión de PPSSPP disponible
 
 [VR]
 % of native FoV = % of native FoV
-6DoF movement = movimiento 6DoF 
+6DoF movement = movimiento 6DoF
 Distance to 2D menus and scenes = Distancia a menús y escenas 2D
 Distance to 3D scenes when VR disabled = Distancia a escenas 3D cuando la realidad virtual está desactivada
 Enable immersive mode = Enable immersive mode

assets/lang/fa_IR.ini

@@ -1172,10 +1172,10 @@ Search term = عبارت جستجو
 
 [Store]
 Connection Error = خطای اتصال
-Details = Details
 Install = نصب
 Installed = نصب شده
 Launch Game = اجرای بازی
+License = License
 Loading... = بارگیری...
 MB = MB
 Size = حجم

assets/lang/fi_FI.ini

@@ -1172,10 +1172,10 @@ Search term = Hakusana
 
 [Store]
 Connection Error = Yhteysvirhe
-Details = Details
 Install = Asenna
 Installed = Jo asennettu
 Launch Game = Käynnistä peli
+License = License
 Loading... = Ladataan...
 MB = Mt
 Size = Koko

assets/lang/fr_FR.ini

@@ -1163,10 +1163,10 @@ Search term = Search term
 
 [Store]
 Connection Error = Erreur de connexion
-Details = Details
 Install = Installer
 Installed = Déjà installé
 Launch Game = Lancer le jeu
+License = License
 Loading... = Chargement...
 MB = Mo
 Size = Taille

assets/lang/gl_ES.ini

@@ -1172,10 +1172,10 @@ Search term = Search term
 
 [Store]
 Connection Error = Erro de conexión
-Details = Details
 Install = Instalar
 Installed = Xa instalado
 Launch Game = Launch game
+License = License
 Loading... = Cargando...
 MB = MB
 Size = Tamaño

assets/lang/gr_EL.ini

@@ -1172,10 +1172,10 @@ Search term = Search term
 
 [Store]
 Connection Error = Σφάλμα σύνδεσης
-Details = Details
 Install = Εγκατάσταση
 Installed = Ήδη εγκατεστημένο
 Launch Game = Έναρξη παιχνιδιού
+License = License
 Loading... = Φόρτωση...
 MB = MB
 Size = Μέγεθος