commit dfebdcd4

Poul Sander · 2022-01-30 18:12
dfebdcd43f9b3ea9ef3b6dc705a60da481791751 patch · browse files
parent bd32d4bd85ff047a30e09e59624afdb2fca88d34

Common font handling between "About" and "Show File"

Changed files

M	source/code/HelpAboutState.cpp before
M	source/code/HelpCommon.cpp before
M	source/code/HelpCommon.hpp before
M	source/code/ShowFileState.cpp before

diff --git a/source/code/HelpAboutState.cpp b/source/code/HelpAboutState.cpp index 4869c33..6a69dee 100644 --- a/source/code/HelpAboutState.cpp +++ b/source/code/HelpAboutState.cpp

@@ -32,16 +32,6 @@ https://blockattack.net

#include "sago/SagoMisc.hpp"

-static void setHelpGamepadFont(const sago::SagoDataHolder* holder, sago::SagoTextField& field, const char* text) {

- field.SetHolder(holder);

- field.SetFont("freeserif");

- field.SetColor({255,255,255,255});

- field.SetFontSize(30);

- field.SetOutline(1, {128,128,128,255});

- field.SetText(text);

HelpAboutState::HelpAboutState() {

SDL_RendererInfo renderInfo;

SDL_version compiled;

@@ -65,7 +55,7 @@ HelpAboutState::HelpAboutState() {

infoStream << _("SDL linked version:") << " " << (int)linked.major << "." << (int)linked.minor << "." << (int)linked.patch << "\n";

infoStream << _("Save folder:") << " " << PHYSFS_getWriteDir() << "\n";

infoStream << _("Locale:") << " " << setlocale( LC_CTYPE, nullptr ) << "\n";

- setHelpGamepadFont(&globalData.spriteHolder->GetDataHolder(), titleField, _("About"));

+ setHelp30FontThinOutline(&globalData.spriteHolder->GetDataHolder(), titleField, _("About"));

setHelpBoxFont(&globalData.spriteHolder->GetDataHolder(), infoBox, infoStream.str().c_str());

sago::WriteFileContent("about.txt", infoStream.str());

}

diff --git a/source/code/HelpCommon.cpp b/source/code/HelpCommon.cpp index bc8dcd3..c9191f1 100644 --- a/source/code/HelpCommon.cpp +++ b/source/code/HelpCommon.cpp

@@ -54,6 +54,11 @@ void setHelpBoxFont(const sago::SagoDataHolder* holder, sago::SagoTextBox& field

field.SetText(text);

}

+void setHelp30FontThinOutline(const sago::SagoDataHolder* holder, sago::SagoTextField& field, const char* text) {

+ setHelp30Font(holder,field, text);

+ field.SetOutline(1, {128,128,128,255});

HelpCommonState::HelpCommonState() {

}

diff --git a/source/code/HelpCommon.hpp b/source/code/HelpCommon.hpp index 5e397aa..2ada98d 100644 --- a/source/code/HelpCommon.hpp +++ b/source/code/HelpCommon.hpp

@@ -32,6 +32,7 @@ https://blockattack.net

void setHelp30Font(const sago::SagoDataHolder* holder, sago::SagoTextField& field, const char* text);

void setHelp30Font(const sago::SagoDataHolder* holder, sago::SagoTextBox& field, const char* text);

+void setHelp30FontThinOutline(const sago::SagoDataHolder* holder, sago::SagoTextField& field, const char* text);

void setHelpBoxFont(const sago::SagoDataHolder* holder, sago::SagoTextBox& field, const char* text);

diff --git a/source/code/ShowFileState.cpp b/source/code/ShowFileState.cpp index 926338d..e420562 100644 --- a/source/code/ShowFileState.cpp +++ b/source/code/ShowFileState.cpp

@@ -25,17 +25,8 @@ https://blockattack.net

#include "MenuSystem.h"

#include <fmt/core.h>

-static void setHelpGamepadFont(const sago::SagoDataHolder* holder, sago::SagoTextField& field, const char* text) {

- field.SetHolder(holder);

- field.SetFont("freeserif");

- field.SetColor({255,255,255,255});

- field.SetFontSize(30);

- field.SetOutline(1, {128,128,128,255});

- field.SetText(text);

ShowFileState::ShowFileState() {

- setHelpGamepadFont(&globalData.spriteHolder->GetDataHolder(), titleField, "");

+ setHelp30FontThinOutline(&globalData.spriteHolder->GetDataHolder(), titleField, "");

setHelpBoxFont(&globalData.spriteHolder->GetDataHolder(), infoBox, "");

setHelpBoxFont(&globalData.spriteHolder->GetDataHolder(), filenameField, "");

}