Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-17 22:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added the ability to center-align badges.

Browse source
This commit is contained in:
Leon Styhre 2023-01-29 12:03:53 +01:00
parent 2874a3c9b7
commit b2bfcf11f6
3 changed files with 59 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
es-core/src/components/BadgeComponent.cpp
View file

@ -215,7 +215,8 @@ void BadgeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
if (elem->has("horizontalAlignment")) {
const std::string horizontalAlignment {elem->get<std::string>("horizontalAlignment")};
if (horizontalAlignment != "left" && horizontalAlignment != "right") {
if (horizontalAlignment != "left" && horizontalAlignment != "center" &&
horizontalAlignment != "right") {
LOG(LogWarning)
<< "BadgeComponent: Invalid theme configuration, property \"horizontalAlignment\" "
"for element \""

56
es-core/src/components/FlexboxComponent.cpp
View file

@ -187,11 +187,13 @@ void FlexboxComponent::calculateLayout()
int pos {0};
float lastY {0.0f};
float itemsOnLastRow {0};
int visibleItemCount {0};
// Position items on the grid.
for (auto& item : mItems) {
if (!item.visible)
continue;
++visibleItemCount;
if (mDirection == "row" && pos > 0) {
if (itemPositions[pos - 1].y < itemPositions[pos].y) {
@ -252,5 +254,59 @@ void FlexboxComponent::calculateLayout()
}
}
if (visibleItemCount > 0 && mAlignment == "center") {
if (mDirection == "row") {
const int gridX {static_cast<int>(grid.x)};
const int fullRows {visibleItemCount / gridX};
int offsetCounter {0};
float offset {std::round(
(mSize.x - ((maxItemSize.x + mItemMargin.x) * grid.x) + mItemMargin.x) / 2.0f)};
// Center items if they don't fill a single row.
if (fullRows == 0) {
const int compCount {gridX - visibleItemCount};
offset += (maxItemSize.x * compCount) / 2.0f;
offset += (mItemMargin.x / 2.0f) * compCount;
}
for (auto& item : mItems) {
if (!item.visible)
continue;
// Move items on full rows using the general centering offset.
glm::vec3 currPos {item.baseImage.getPosition()};
item.baseImage.setPosition(currPos.x + offset, currPos.y, currPos.z);
if (item.overlayImage.getTexture() != nullptr) {
currPos = item.overlayImage.getPosition();
item.overlayImage.setPosition(currPos.x + offset, currPos.y, currPos.z);
}
++offsetCounter;
// Items on the last non-full row will need to be moved according to how many
// items less than a full row there are.
if (offsetCounter == fullRows * gridX) {
const int compCount {gridX - (visibleItemCount - offsetCounter)};
offset += (maxItemSize.x * compCount) / 2.0f;
offset += (mItemMargin.x / 2.0f) * compCount;
}
}
}
else if (mDirection == "column") {
const int gridY {static_cast<int>(grid.y)};
int columnCount {visibleItemCount / gridY};
if (visibleItemCount % gridY != 0)
++columnCount;
const float offset {std::round(
(mSize.x - ((maxItemSize.x + mItemMargin.x) * columnCount) + mItemMargin.x) /
2.0f)};
for (auto& item : mItems) {
if (!item.visible)
continue;
glm::vec3 currPos {item.baseImage.getPosition()};
item.baseImage.setPosition(currPos.x + offset, currPos.y, currPos.z);
if (item.overlayImage.getTexture() != nullptr) {
currPos = item.overlayImage.getPosition();
item.overlayImage.setPosition(currPos.x + offset, currPos.y, currPos.z);
}
}
}
}
mLayoutValid = true;
}

2
es-core/src/components/FlexboxComponent.h
View file

@ -43,7 +43,7 @@ public:
const std::string& getAlignment() const { return mAlignment; }
void setAlignment(const std::string& value)
{
assert(value == "left" || value == "right");
assert(value == "left" || value == "right" || value == "center");
mAlignment = value;
mLayoutValid = false;
}