jaildesigner-jailgames/aee-arcade
0
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(notifier): geometria al ui.yaml; +1px alçada, text 1px més avall, marge superior 3

Browse Source
This commit is contained in:
JailDesigner committed 2026-05-02 14:43:04 +02:00
1 parent 643e5442c3
commit 2e8df45b38
6 files changed
+92 -27
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

source/core/rendering/notifier.cpp
+21 -16
View File
@@ -6,6 +6,7 @@
#include "core/rendering/screen.hpp"
#include "core/rendering/text.hpp"
#include "core/ui/ui_config.hpp"
#include "utils/defines.hpp"
namespace {
@@ -67,12 +68,13 @@ void Notifier::init(std::shared_ptr<Text> text, const Palette& ui_palette) {
}
void Notifier::update(int delta_ms) {
const auto& geo = UiConfig::get().notifier();
const float DT = static_cast<float>(delta_ms) / 1000.0F;
switch (status_) {
case Status::RISING:
y_ += SLIDE_SPEED * DT;
if (y_ >= static_cast<float>(MARGIN_TOP + BORDER_PX)) {
y_ = static_cast<float>(MARGIN_TOP + BORDER_PX);
y_ += geo.slide_speed * DT;
if (y_ >= static_cast<float>(geo.margin_top + geo.border_px)) {
y_ = static_cast<float>(geo.margin_top + geo.border_px);
status_ = Status::ACTIVE;
}
break;
@@ -81,9 +83,9 @@ void Notifier::update(int delta_ms) {
if (remaining_ms_ <= 0) { status_ = Status::VANISHING; }
break;
case Status::VANISHING:
y_ -= SLIDE_SPEED * DT;
if (y_ <= static_cast<float>(-current_box_h_ - BORDER_PX)) {
y_ = static_cast<float>(-current_box_h_ - BORDER_PX - MARGIN_TOP);
y_ -= geo.slide_speed * DT;
if (y_ <= static_cast<float>(-current_box_h_ - geo.border_px)) {
y_ = static_cast<float>(-current_box_h_ - geo.border_px - geo.margin_top);
status_ = Status::HIDDEN;
}
break;
@@ -95,6 +97,7 @@ void Notifier::update(int delta_ms) {
void Notifier::render() {
if (status_ == Status::HIDDEN || text_ == nullptr || current_lines_.empty()) { return; }
const auto& geo = UiConfig::get().notifier();
const int BOX_X = (GameCanvas::WIDTH - current_box_w_) / 2;
const int BOX_Y = static_cast<int>(y_);
@@ -106,13 +109,13 @@ void Notifier::render() {
// costat i una mica fora de la caixa. Cada segment es queda dins del
// rang del costat corresponent perquè les cantonades no es cobrisquen.
const std::uint32_t BORDER_ARGB = ui_palette_[current_text_color_];
Screen::get().fillRect(BOX_X, BOX_Y - BORDER_PX, current_box_w_, BORDER_PX, BORDER_ARGB);
Screen::get().fillRect(BOX_X, BOX_Y + current_box_h_, current_box_w_, BORDER_PX, BORDER_ARGB);
Screen::get().fillRect(BOX_X - BORDER_PX, BOX_Y, BORDER_PX, current_box_h_, BORDER_ARGB);
Screen::get().fillRect(BOX_X + current_box_w_, BOX_Y, BORDER_PX, current_box_h_, BORDER_ARGB);
Screen::get().fillRect(BOX_X, BOX_Y - geo.border_px, current_box_w_, geo.border_px, BORDER_ARGB);
Screen::get().fillRect(BOX_X, BOX_Y + current_box_h_, current_box_w_, geo.border_px, BORDER_ARGB);
Screen::get().fillRect(BOX_X - geo.border_px, BOX_Y, geo.border_px, current_box_h_, BORDER_ARGB);
Screen::get().fillRect(BOX_X + current_box_w_, BOX_Y, geo.border_px, current_box_h_, BORDER_ARGB);
const int LINE_STEP = Rendering::Hud::FONT_SIZE_PX + LINE_GAP;
int line_y = BOX_Y + PADDING_V;
const int LINE_STEP = Rendering::Hud::FONT_SIZE_PX + geo.line_gap;
int line_y = BOX_Y + geo.padding_top;
for (const auto& line : current_lines_) {
text_->writeDX(Text::CENTER_FLAG | Text::COLOR_FLAG,
GameCanvas::CENTER_X,
@@ -129,18 +132,20 @@ void Notifier::notify(const std::string& text, Uint8 text_color, Uint8 bg_color,
// gestionar-ne una cua, canviar ací per una FIFO quan calga.
if (text_ == nullptr) { return; }
const auto& geo = UiConfig::get().notifier();
const int MAX_TEXT_WIDTH = GameCanvas::WIDTH - (2 * SIDE_MARGIN) - (2 * geo.padding_h);
current_lines_ = wrapToWidth(text, MAX_TEXT_WIDTH, *text_, 1);
// Amplada = max de les línies + padding. Alçada = N*glif + (N-1)*gap + padding.
// Amplada = max de les línies + padding. Alçada = N*glif + (N-1)*gap + padding asimètric.
const int MAX_LINE_W = std::accumulate(current_lines_.begin(), current_lines_.end(), 0, [this](int acc, const std::string& s) { return std::max(acc, text_->length(s, 1)); });
current_box_w_ = MAX_LINE_W + (2 * PADDING_H);
current_box_w_ = MAX_LINE_W + (2 * geo.padding_h);
const int N = static_cast<int>(current_lines_.size());
current_box_h_ = (N * Rendering::Hud::FONT_SIZE_PX) + ((N - 1) * LINE_GAP) + (2 * PADDING_V);
current_box_h_ = (N * Rendering::Hud::FONT_SIZE_PX) + ((N - 1) * geo.line_gap) + geo.padding_top + geo.padding_bottom;
current_text_color_ = text_color;
current_bg_color_ = bg_color;
remaining_ms_ = time_ms;
y_ = static_cast<float>(-current_box_h_ - BORDER_PX - MARGIN_TOP);
y_ = static_cast<float>(-current_box_h_ - geo.border_px - geo.margin_top);
status_ = Status::RISING;
}
source/core/rendering/notifier.hpp
+5 -10
View File
@@ -43,16 +43,11 @@ class Notifier {
void notify(const std::string& text, Uint8 text_color, Uint8 bg_color, int time_ms);
static constexpr int PADDING_H = 6;
static constexpr int PADDING_V = 3;
static constexpr int LINE_GAP = 1; // Separació vertical entre línies multilinia.
static constexpr int MARGIN_TOP = 2; // Separació amb la vora superior del canvas (fins a la línia exterior).
static constexpr int BORDER_PX = 1; // Gruix de la vora externa de color text.
static constexpr float SLIDE_SPEED = 120.0F;
// Amplada màxima (sense comptar padding) que pot ocupar el text abans que
// `wrapToWidth` el parteixi en línies. Deixem marge respecte a la vora del
// canvas perquè la caixa no toqui els laterals.
static constexpr int MAX_TEXT_WIDTH = GameCanvas::WIDTH - 20 - (2 * PADDING_H);
// Marge lateral entre la caixa i les vores esquerra/dreta del canvas.
// Limita l'amplada disponible al text en multilinia (combinat amb el
// padding horitzontal llegit d'UiConfig). No està exposat al YAML
// perquè en pantalles 240 px no té sentit retallar més.
static constexpr int SIDE_MARGIN = 10;
private:
enum class Status : std::uint8_t { HIDDEN,
source/core/ui/ui_config.cpp
+21 -1
View File
@@ -102,7 +102,16 @@ UiConfig::UiConfig()
placeholder_font_{.name = Defaults::UI::Font::PLACEHOLDER_NAME, .gif = Defaults::UI::Font::PLACEHOLDER_GIF, .fnt = Defaults::UI::Font::PLACEHOLDER_FNT, .kerning = Defaults::UI::Font::PLACEHOLDER_KERNING},
room_text_font_{.name = Defaults::UI::Font::ROOM_TEXT_NAME, .gif = Defaults::UI::Font::ROOM_TEXT_GIF, .fnt = Defaults::UI::Font::ROOM_TEXT_FNT, .kerning = Defaults::UI::Font::ROOM_TEXT_KERNING},
menu_title_font_{.name = Defaults::UI::Font::MENU_TITLE_NAME, .gif = Defaults::UI::Font::MENU_TITLE_GIF, .fnt = Defaults::UI::Font::MENU_TITLE_FNT, .kerning = Defaults::UI::Font::MENU_TITLE_KERNING},
menu_items_font_{.name = Defaults::UI::Font::MENU_ITEMS_NAME, .gif = Defaults::UI::Font::MENU_ITEMS_GIF, .fnt = Defaults::UI::Font::MENU_ITEMS_FNT, .kerning = Defaults::UI::Font::MENU_ITEMS_KERNING} {
menu_items_font_{.name = Defaults::UI::Font::MENU_ITEMS_NAME, .gif = Defaults::UI::Font::MENU_ITEMS_GIF, .fnt = Defaults::UI::Font::MENU_ITEMS_FNT, .kerning = Defaults::UI::Font::MENU_ITEMS_KERNING},
notifier_{
.padding_h = Defaults::UI::Notifier::PADDING_H,
.padding_top = Defaults::UI::Notifier::PADDING_TOP,
.padding_bottom = Defaults::UI::Notifier::PADDING_BOTTOM,
.line_gap = Defaults::UI::Notifier::LINE_GAP,
.margin_top = Defaults::UI::Notifier::MARGIN_TOP,
.border_px = Defaults::UI::Notifier::BORDER_PX,
.slide_speed = Defaults::UI::Notifier::SLIDE_SPEED,
} {
}
auto UiConfig::get() -> UiConfig& {
@@ -193,6 +202,17 @@ void UiConfig::load(const std::string& file_path) {
readField(s, "menu_accept", menu_accept_sound_);
}
if (yaml.contains("notifier")) {
const auto& n = yaml["notifier"];
readField(n, "padding_h", notifier_.padding_h);
readField(n, "padding_top", notifier_.padding_top);
readField(n, "padding_bottom", notifier_.padding_bottom);
readField(n, "line_gap", notifier_.line_gap);
readField(n, "margin_top", notifier_.margin_top);
readField(n, "border_px", notifier_.border_px);
readField(n, "slide_speed", notifier_.slide_speed);
}
std::cout << "UiConfig: carregat des de " << file_path << '\n';
} catch (const std::exception& e) {
std::cerr << "UiConfig: error parsejant " << file_path << ": " << e.what() << '\n';
source/core/ui/ui_config.hpp
+18
View File
@@ -20,6 +20,19 @@ class UiConfig {
int kerning;
};
// Geometria del Notifier (popup superior). Carregada des de
// data/ui.yaml secció `notifier:`; els valors per defecte vénen de
// Defaults::UI::Notifier.
struct Notifier {
int padding_h;
int padding_top;
int padding_bottom;
int line_gap;
int margin_top;
int border_px;
float slide_speed;
};
static auto get() -> UiConfig&;
UiConfig(const UiConfig&) = delete;
@@ -88,6 +101,9 @@ class UiConfig {
[[nodiscard]] auto menuTitleFont() const -> const Font& { return menu_title_font_; }
[[nodiscard]] auto menuItemsFont() const -> const Font& { return menu_items_font_; }
// Geometria del Notifier.
[[nodiscard]] auto notifier() const -> const Notifier& { return notifier_; }
// Flags visuals.
[[nodiscard]] auto hudBgEnabled() const -> bool { return hud_bg_enabled_; }
@@ -135,5 +151,7 @@ class UiConfig {
Font menu_title_font_;
Font menu_items_font_;
Notifier notifier_;
bool hud_bg_enabled_{false};
};