Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-04-10 19:15:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added backgroundColor, backgroundColorEnd, backgroundGradientType, backgroundPadding and backgroundCornerRadius properties to the helpsystem element

Browse source
This commit is contained in:
Leon Styhre 2025-02-27 12:03:31 +01:00
parent 46370517d9
commit 872318914b
3 changed files with 81 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
es-core/src/ThemeData.cpp
View file

@ -571,6 +571,11 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"iconTextSpacing", FLOAT},
{"iconTextSpacingDimmed", FLOAT},
{"letterCase", STRING},
{"backgroundColor", COLOR},
{"backgroundColorEnd", COLOR},
{"backgroundGradientType", STRING},
{"backgroundPadding", NORMALIZED_PAIR},
{"backgroundCornerRadius", FLOAT},
{"opacity", FLOAT},
{"opacityDimmed", FLOAT},
{"customButtonIcon", PATH}}},

71
es-core/src/components/HelpComponent.cpp
View file

@ -12,6 +12,7 @@
#include "Window.h"
#include "components/ImageComponent.h"
#include "components/TextComponent.h"
#include "utils/MathUtil.h"
#define PREFIX "button_"
@ -30,6 +31,11 @@ HelpComponent::HelpComponent(std::shared_ptr<Font> font)
, mStyleTextColorDimmed {0x777777FF}
, mStyleIconColor {0x777777FF}
, mStyleIconColorDimmed {0x777777FF}
, mStyleBackgroundColor {0x00000000}
, mStyleBackgroundColorEnd {0x00000000}
, mStyleBackgroundPadding {0.0f, 0.0f}
, mStyleBackgroundCornerRadius {0.0f}
, mStyleColorGradientHorizontal {true}
, mStyleEntryLayout {EntryLayout::ICON_FIRST}
, mStyleRotation {0.0f}
, mStyleEntrySpacing {0.00833f}
@ -120,6 +126,46 @@ void HelpComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
else
mStyleIconColorDimmed = mStyleIconColor;
if (elem->has("backgroundColor")) {
mStyleBackgroundColor = elem->get<unsigned int>("backgroundColor");
if (elem->has("backgroundColorEnd"))
mStyleBackgroundColorEnd = elem->get<unsigned int>("backgroundColorEnd");
else
mStyleBackgroundColorEnd = mStyleBackgroundColor;
if (elem->has("backgroundGradientType")) {
const std::string& backgroundGradientType {
elem->get<std::string>("backgroundGradientType")};
if (backgroundGradientType == "horizontal") {
mStyleColorGradientHorizontal = true;
}
else if (backgroundGradientType == "vertical") {
mStyleColorGradientHorizontal = false;
}
else {
mStyleColorGradientHorizontal = true;
LOG(LogWarning) << "HelpComponent: Invalid theme configuration, property "
"\"backgroundGradientType\" for element \""
<< element.substr(11) << "\" defined as \""
<< backgroundGradientType << "\"";
}
}
}
if (elem->has("backgroundPadding")) {
const glm::vec2 backgroundPadding {
glm::clamp(elem->get<glm::vec2>("backgroundPadding"), 0.0f, 0.2f)};
mStyleBackgroundPadding.x = backgroundPadding.x * mRenderer->getScreenWidth();
mStyleBackgroundPadding.y = backgroundPadding.y * mRenderer->getScreenHeight();
}
if (elem->has("backgroundCornerRadius")) {
mStyleBackgroundCornerRadius =
glm::clamp(elem->get<float>("backgroundCornerRadius"), 0.0f, 0.5f) *
mRenderer->getScreenWidth();
}
if (elem->has("fontPath") || elem->has("fontSize")) {
mStyleFont = Font::getFromTheme(elem, ThemeFlags::ALL, mStyleFont);
if (!elem->has("fontSizeDimmed"))
@ -314,6 +360,31 @@ void HelpComponent::render(const glm::mat4& parentTrans)
if (!mVisible)
return;
if (mStyleBackgroundColor != 0x00000000) {
mPosition = mGrid->getPosition();
mSize = mGrid->getSize();
mOrigin = mGrid->getOrigin();
mRotation = mStyleRotation;
mRotationOrigin = mStyleRotationOrigin;
glm::mat4 trans {parentTrans * getTransform()};
trans = glm::translate(trans, glm::vec3 {-mStyleBackgroundPadding.x / 2.0f,
-mStyleBackgroundPadding.y / 2.0f, 0.0f});
mRenderer->setMatrix(trans);
mRenderer->drawRect(
0.0f, 0.0f, mSize.x + mStyleBackgroundPadding.x, mSize.y + mStyleBackgroundPadding.y,
mStyleBackgroundColor, mStyleBackgroundColorEnd, mStyleColorGradientHorizontal,
mThemeOpacity, 1.0f, Renderer::BlendFactor::SRC_ALPHA,
Renderer::BlendFactor::ONE_MINUS_SRC_ALPHA, mStyleBackgroundCornerRadius);
mPosition = {0.0f, 0.0f, 0.0f};
mSize = {0.0f, 0.0f};
mOrigin = {0.0f, 0.0f};
mRotation = 0.0f;
mRotationOrigin = {0.5f, 0.5f};
}
const glm::mat4 trans {parentTrans * getTransform()};
if (mGrid) {

5
es-core/src/components/HelpComponent.h
View file

@ -85,6 +85,11 @@ private:
unsigned int mStyleTextColorDimmed;
unsigned int mStyleIconColor;
unsigned int mStyleIconColorDimmed;
unsigned int mStyleBackgroundColor;
unsigned int mStyleBackgroundColorEnd;
glm::vec2 mStyleBackgroundPadding;
float mStyleBackgroundCornerRadius;
bool mStyleColorGradientHorizontal;
EntryLayout mStyleEntryLayout;
float mStyleRotation;
float mStyleEntrySpacing;