Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-26 08:05:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added a wheelHorizontalAlignment property for aligning the carousel within the overall element area.

Browse source
This commit is contained in:
Leon Styhre 2022-06-03 20:53:15 +02:00
parent 94a8ef8791
commit 269e2e8202
2 changed files with 59 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -262,6 +262,7 @@ std::map<std::string, std::map<std::string, ThemeData::ElementPropertyType>>
{"itemRotationOrigin", NORMALIZED_PAIR}, {"itemRotationOrigin", NORMALIZED_PAIR},
{"itemHorizontalAlignment", STRING}, {"itemHorizontalAlignment", STRING},
{"itemVerticalAlignment", STRING}, {"itemVerticalAlignment", STRING},
{"wheelHorizontalAlignment", STRING},
{"horizontalOffset", FLOAT}, {"horizontalOffset", FLOAT},
{"verticalOffset", FLOAT}, {"verticalOffset", FLOAT},
{"reflections", BOOLEAN}, {"reflections", BOOLEAN},

58
es-core/src/components/primary/CarouselComponent.h
View file

@ -125,6 +125,7 @@ private:
float mLineSpacing; float mLineSpacing;
Alignment mItemHorizontalAlignment; Alignment mItemHorizontalAlignment;
Alignment mItemVerticalAlignment; Alignment mItemVerticalAlignment;
Alignment mWheelHorizontalAlignment;
float mUnfocusedItemOpacity; float mUnfocusedItemOpacity;
float mMaxItemCount; float mMaxItemCount;
glm::vec2 mItemSize; glm::vec2 mItemSize;
@ -160,6 +161,7 @@ CarouselComponent<T>::CarouselComponent()
, mLineSpacing {1.5f} , mLineSpacing {1.5f}
, mItemHorizontalAlignment {ALIGN_CENTER} , mItemHorizontalAlignment {ALIGN_CENTER}
, mItemVerticalAlignment {ALIGN_CENTER} , mItemVerticalAlignment {ALIGN_CENTER}
, mWheelHorizontalAlignment {ALIGN_CENTER}
, mUnfocusedItemOpacity {0.5f} , mUnfocusedItemOpacity {0.5f}
, mMaxItemCount {3.0f} , mMaxItemCount {3.0f}
, mItemSize {Renderer::getScreenWidth() * 0.25f, Renderer::getScreenHeight() * 0.155f} , mItemSize {Renderer::getScreenWidth() * 0.25f, Renderer::getScreenHeight() * 0.155f}
@ -502,10 +504,47 @@ template <typename T> void CarouselComponent<T>::render(const glm::mat4& parentT
glm::vec2 itemSpacing {0.0f, 0.0f}; glm::vec2 itemSpacing {0.0f, 0.0f};
float xOff {0.0f}; float xOff {0.0f};
float yOff {0.0f}; float yOff {0.0f};
float scaleSize {mItemSize.x * mItemScale - mItemSize.x};
if (mType == CarouselType::HORIZONTAL_WHEEL || mType == CarouselType::VERTICAL_WHEEL) { if (mType == CarouselType::HORIZONTAL_WHEEL || mType == CarouselType::VERTICAL_WHEEL) {
xOff = (mSize.x - mItemSize.x) / 2.0f - (mEntryCamOffset * itemSpacing.y); xOff = (mSize.x - mItemSize.x) / 2.0f - (mEntryCamOffset * itemSpacing.y);
yOff = (mSize.y - mItemSize.y) / 2.0f; yOff = (mSize.y - mItemSize.y) / 2.0f;
// Alignment of the actual carousel inside to the overall component area.
if (mLegacyMode) {
if (mItemHorizontalAlignment == ALIGN_LEFT)
xOff = mSize.x / 10.0f;
else if (mItemHorizontalAlignment == ALIGN_RIGHT)
xOff = mSize.x - (mItemSize.x * 1.1f);
else
xOff = (mSize.x - mItemSize.x) / 2.0f;
}
else {
if (mWheelHorizontalAlignment == ALIGN_RIGHT) {
xOff += mSize.x / 2.0f;
if (mItemHorizontalAlignment == ALIGN_LEFT)
xOff -= mItemSize.x / 2.0f + scaleSize;
else if (mItemHorizontalAlignment == ALIGN_RIGHT)
xOff -= mItemSize.x / 2.0f;
else
xOff -= mItemSize.x / 2.0f + scaleSize / 2.0f;
}
else if (mWheelHorizontalAlignment == ALIGN_LEFT) {
xOff -= (mSize.x / 2.0f);
if (mItemHorizontalAlignment == ALIGN_LEFT)
xOff += mItemSize.x / 2.0f;
else if (mItemHorizontalAlignment == ALIGN_RIGHT)
xOff += mItemSize.x / 2.0f + scaleSize;
else
xOff += mItemSize.x / 2.0f + scaleSize / 2.0f;
}
else if (mWheelHorizontalAlignment == ALIGN_CENTER &&
mItemHorizontalAlignment != ALIGN_CENTER) {
if (mItemHorizontalAlignment == ALIGN_RIGHT)
xOff += scaleSize / 2.0f;
else if (mItemHorizontalAlignment == ALIGN_LEFT)
xOff -= scaleSize / 2.0f;
}
}
} }
else if (mType == CarouselType::VERTICAL) { else if (mType == CarouselType::VERTICAL) {
itemSpacing.y = ((mSize.y - (mItemSize.y * mMaxItemCount)) / (mMaxItemCount)) + mItemSize.y; itemSpacing.y = ((mSize.y - (mItemSize.y * mMaxItemCount)) / (mMaxItemCount)) + mItemSize.y;
@ -806,6 +845,25 @@ void CarouselComponent<T>::applyTheme(const std::shared_ptr<ThemeData>& theme,
} }
} }
if (elem->has("wheelHorizontalAlignment")) {
const std::string alignment {elem->get<std::string>("wheelHorizontalAlignment")};
if (alignment == "left") {
mWheelHorizontalAlignment = ALIGN_LEFT;
}
else if (alignment == "right") {
mWheelHorizontalAlignment = ALIGN_RIGHT;
}
else if (alignment == "center") {
mWheelHorizontalAlignment = ALIGN_CENTER;
}
else {
LOG(LogWarning) << "CarouselComponent: Invalid theme configuration, property "
"<wheelHorizontalAlignment> defined as \""
<< alignment << "\"";
mWheelHorizontalAlignment = ALIGN_CENTER;
}
}
if (elem->has("horizontalOffset")) if (elem->has("horizontalOffset"))
mHorizontalOffset = glm::clamp(elem->get<float>("horizontalOffset"), -1.0f, 1.0f); mHorizontalOffset = glm::clamp(elem->get<float>("horizontalOffset"), -1.0f, 1.0f);