From 9eaf3bc134c40ccbb93a6fefb1e13e0b7eed9f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= <jaildesigner@gmail.com>
Date: Thu, 6 Mar 2025 23:12:53 +0100
Subject: [PATCH] Retocat un poc el disseny de Title Retocades les
 notificacions

---
 data/title/title_logo.gif | Bin 2348 -> 1630 bytes
 source/notifier.cpp       |  18 +++++++++++-------
 source/title.cpp          |  11 +++++------
 source/title.h            |   2 +-
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/data/title/title_logo.gif b/data/title/title_logo.gif
index 4cf3557e5d7f04bba91beeee940d2d5984eaf27f..4a36fb1922c89d823386933943200377fb35c59c 100644
GIT binary patch
delta 1556
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
G0029RfhUOo

delta 2279
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
Bm@EJQ

diff --git a/source/notifier.cpp b/source/notifier.cpp
index f1db333c..6e9b1ebc 100644
--- a/source/notifier.cpp
+++ b/source/notifier.cpp
@@ -183,12 +183,14 @@ void Notifier::show(std::vector<std::string> texts, NotificationText text_is, in
     }
 
     // Inicializa variables
-    const auto PADDING_IN_H = text_->getCharacterSize();
-    const auto PADDING_IN_V = text_->getCharacterSize() / 2;
+    //const int text_size = text_->getCharacterSize();
+    const int text_size = 6;
+    const auto PADDING_IN_H = text_size;
+    const auto PADDING_IN_V = text_size / 2;
     const int ICON_SPACE = icon >= 0 ? ICON_SIZE_ + PADDING_IN_H : 0;
     text_is = ICON_SPACE > 0 ? NotificationText::LEFT : text_is;
     const int WIDTH = options.game.width - (PADDING_OUT_ * 2);
-    const int HEIGHT = (text_->getCharacterSize() * texts.size()) + (PADDING_IN_V * 2);
+    const int HEIGHT = (text_size * texts.size()) + (PADDING_IN_V * 2);
     const auto SHAPE = NotificationShape::SQUARED;
 
     // Posición horizontal
@@ -237,7 +239,7 @@ void Notifier::show(std::vector<std::string> texts, NotificationText text_is, in
     n.surface = std::make_shared<Surface>(WIDTH, HEIGHT);
 
     // Prepara para dibujar en la textura
-	auto previuos_renderer = Screen::get()->getRendererSurface();
+    auto previuos_renderer = Screen::get()->getRendererSurface();
     Screen::get()->setRendererSurface(n.surface);
 
     // Dibuja el fondo de la notificación
@@ -260,6 +262,8 @@ void Notifier::show(std::vector<std::string> texts, NotificationText text_is, in
     else if (SHAPE == NotificationShape::SQUARED)
     {
         n.surface->clear(bg_color_);
+        SDL_Rect rect = {0, 0, n.surface->getWidth(), n.surface->getHeight()};
+        n.surface->drawRectBorder(&rect, static_cast<Uint8>(PaletteColor::RED));
     }
 
     // Dibuja el icono de la notificación
@@ -272,17 +276,17 @@ void Notifier::show(std::vector<std::string> texts, NotificationText text_is, in
     }
 
     // Escribe el texto de la notificación
-    const Uint8 COLOR = stringToColor("white");
+    const Uint8 COLOR = static_cast<Uint8>(PaletteColor::WHITE);
     int iterator = 0;
     for (const auto &text : texts)
     {
         switch (text_is)
         {
         case NotificationText::LEFT:
-            text_->writeColored(PADDING_IN_H + ICON_SPACE, PADDING_IN_V + iterator * (text_->getCharacterSize() + 1), text, COLOR);
+            text_->writeColored(PADDING_IN_H + ICON_SPACE, PADDING_IN_V + iterator * (text_size + 1), text, COLOR);
             break;
         case NotificationText::CENTER:
-            text_->writeDX(TEXT_CENTER | TEXT_COLOR, WIDTH / 2, PADDING_IN_V + iterator * (text_->getCharacterSize() + 1), text, 1, COLOR);
+            text_->writeDX(TEXT_CENTER | TEXT_COLOR, WIDTH / 2, PADDING_IN_V + iterator * (text_size + 1), text, 1, COLOR);
             break;
         default:
             break;
diff --git a/source/title.cpp b/source/title.cpp
index 592b0319..b2dd1d1a 100644
--- a/source/title.cpp
+++ b/source/title.cpp
@@ -140,7 +140,7 @@ void Title::checkInput()
 // Actualiza la marquesina
 void Title::updateMarquee()
 {
-	const auto TEXT = Resource::get()->getText("smb2");
+	const auto TEXT = Resource::get()->getText("gauntlet");
 
 	for (int i = 0; i < (int)letters_.size(); ++i)
 	{
@@ -172,12 +172,12 @@ void Title::updateMarquee()
 // Dibuja la marquesina
 void Title::renderMarquee()
 {
-	const auto TEXT = Resource::get()->getText("smb2");
+	const auto TEXT = Resource::get()->getText("gauntlet");
 	for (const auto &l : letters_)
 	{
 		if (l.enabled)
 		{
-			TEXT->writeColored(l.x, 184, l.letter, stringToColor("white"));
+			TEXT->writeColored(l.x, 184, l.letter, static_cast<Uint8>(PaletteColor::BRIGHT_RED));
 		}
 	}
 }
@@ -327,8 +327,7 @@ void Title::fillSurface()
 	text->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 11 * TEXT_SIZE, "1.PLAY", 1, COLOR);
 	text->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 13 * TEXT_SIZE, "2.ACHIEVEMENTS", 1, COLOR);
 	text->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 15 * TEXT_SIZE, "3.REDEFINE KEYS", 1, COLOR);
-	text->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 20 * TEXT_SIZE, "ESC.EXIT GAME", 1, COLOR);
-	text->writeColored(PLAY_AREA_CENTER_X, 30 * TEXT_SIZE, "ESC.EXIT GAME", COLOR);
+	//text->writeDX(TEXT_CENTER | TEXT_COLOR, PLAY_AREA_CENTER_X, 20 * TEXT_SIZE, "ESC.EXIT GAME", 1, COLOR);
 
 	// Devuelve el puntero del renderizador a su sitio
 	Screen::get()->setRendererSurface(previuos_renderer);
@@ -341,7 +340,7 @@ void Title::createCheevosTexture()
 	const auto CHEEVOS_LIST = Cheevos::get()->list();
 	const auto TEXT = Resource::get()->getText("subatomic");
 	constexpr int CHEEVOS_TEXTURE_WIDTH = 200;
-	constexpr int CHEEVOS_TEXTURE_VIEW_HEIGHT = 110;
+	constexpr int CHEEVOS_TEXTURE_VIEW_HEIGHT = 110 - 8;
 	constexpr int CHEEVOS_TEXTURE_POS_Y = 73;
 	constexpr int CHEEVOS_PADDING = 10;
 	const int CHEEVO_HEIGHT = CHEEVOS_PADDING + (TEXT->getCharacterSize() * 2) + 1;
diff --git a/source/title.h b/source/title.h
index 619fd0e3..d88e3366 100644
--- a/source/title.h
+++ b/source/title.h
@@ -39,7 +39,7 @@ private:
 	std::string long_text_;			   // Texto que aparece en la parte inferior del titulo
 	Uint32 ticks_ = 0;				   // Contador de ticks para ajustar la velocidad del programa
 	std::vector<TitleLetter> letters_; // Vector con las letras de la marquesina
-	int marquee_speed_ = 3;			   // Velocidad de desplazamiento de la marquesina
+	int marquee_speed_ = 2;			   // Velocidad de desplazamiento de la marquesina
 	bool show_cheevos_ = false;		   // Indica si se muestra por pantalla el listado de logros
 	SDL_Rect cheevos_surface_view_;	   // Zona visible de la surface con el listado de logros
 	TitleState state_;				   // Estado en el que se encuentra el bucle principal