Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2025-01-30 12:05:39 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Changed the order of some variables in TextListComponent.

Browse source
This commit is contained in:
Leon Styhre 2023-01-13 14:22:31 +01:00
parent 648252f639
commit 635fdaca06
1 changed files with 22 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
es-core/src/components/primary/TextListComponent.h
View file

@ -118,37 +118,34 @@ private:
std::function<void(CursorState state)> mCursorChangedCallback; std::function<void(CursorState state)> mCursorChangedCallback;
float mCamOffset; float mCamOffset;
int mPreviousScrollVelocity; int mPreviousScrollVelocity;
int mLoopOffset1; int mLoopOffset1;
int mLoopOffset2; int mLoopOffset2;
int mLoopTime; int mLoopTime;
bool mLoopScroll; bool mLoopScroll;
PrimaryAlignment mAlignment;
float mHorizontalMargin;
ImageComponent mSelectorImage;
std::shared_ptr<Font> mFont;
std::string mIndicators;
std::string mCollectionIndicators;
bool mGamelistView; bool mGamelistView;
bool mLegacyMode; bool mLegacyMode;
bool mFadeAbovePrimary;
LetterCase mLetterCase; std::shared_ptr<Font> mFont;
LetterCase mLetterCaseAutoCollections;
LetterCase mLetterCaseCustomCollections;
float mLineSpacing;
float mSelectorHeight; float mSelectorHeight;
float mSelectorHorizontalOffset; float mSelectorHorizontalOffset;
float mSelectorVerticalOffset; float mSelectorVerticalOffset;
unsigned int mSelectorColor; unsigned int mSelectorColor;
unsigned int mSelectorColorEnd; unsigned int mSelectorColorEnd;
bool mSelectorColorGradientHorizontal; bool mSelectorColorGradientHorizontal;
ImageComponent mSelectorImage;
unsigned int mPrimaryColor; unsigned int mPrimaryColor;
unsigned int mSecondaryColor; unsigned int mSecondaryColor;
unsigned int mSelectedColor; unsigned int mSelectedColor;
unsigned int mSelectedSecondaryColor; unsigned int mSelectedSecondaryColor;
PrimaryAlignment mAlignment;
float mHorizontalMargin;
LetterCase mLetterCase;
LetterCase mLetterCaseAutoCollections;
LetterCase mLetterCaseCustomCollections;
float mLineSpacing;
std::string mIndicators;
std::string mCollectionIndicators;
bool mFadeAbovePrimary;
}; };
template <typename T> template <typename T>
@ -163,18 +160,9 @@ TextListComponent<T>::TextListComponent()
, mLoopOffset2 {0} , mLoopOffset2 {0}
, mLoopTime {0} , mLoopTime {0}
, mLoopScroll {false} , mLoopScroll {false}
, mAlignment {PrimaryAlignment::ALIGN_CENTER}
, mHorizontalMargin {0.0f}
, mFont {Font::get(FONT_SIZE_MEDIUM)}
, mIndicators {"symbols"}
, mCollectionIndicators {"symbols"}
, mGamelistView {std::is_same_v<T, FileData*> ? true : false} , mGamelistView {std::is_same_v<T, FileData*> ? true : false}
, mLegacyMode {false} , mLegacyMode {false}
, mFadeAbovePrimary {false} , mFont {Font::get(FONT_SIZE_MEDIUM)}
, mLetterCase {LetterCase::NONE}
, mLetterCaseAutoCollections {LetterCase::UNDEFINED}
, mLetterCaseCustomCollections {LetterCase::UNDEFINED}
, mLineSpacing {1.5f}
, mSelectorHeight {mFont->getSize() * 1.5f} , mSelectorHeight {mFont->getSize() * 1.5f}
, mSelectorHorizontalOffset {0.0f} , mSelectorHorizontalOffset {0.0f}
, mSelectorVerticalOffset {0.0f} , mSelectorVerticalOffset {0.0f}
@ -185,6 +173,15 @@ TextListComponent<T>::TextListComponent()
, mSecondaryColor {0x00FF00FF} , mSecondaryColor {0x00FF00FF}
, mSelectedColor {0x0000FFFF} , mSelectedColor {0x0000FFFF}
, mSelectedSecondaryColor {0x00FF00FF} , mSelectedSecondaryColor {0x00FF00FF}
, mAlignment {PrimaryAlignment::ALIGN_CENTER}
, mHorizontalMargin {0.0f}
, mLetterCase {LetterCase::NONE}
, mLetterCaseAutoCollections {LetterCase::UNDEFINED}
, mLetterCaseCustomCollections {LetterCase::UNDEFINED}
, mLineSpacing {1.5f}
, mIndicators {"symbols"}
, mCollectionIndicators {"symbols"}
, mFadeAbovePrimary {false}
{ {
} }