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

Made the list selected color have no effect if zero.

Browse source
This commit is contained in:
Aloshi 2013-01-08 09:23:28 -06:00
parent 9da01403a0
commit 8fc2b8377a
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
THEMES.md
View file

@ -96,7 +96,7 @@ Display tags define some "meta" display attributes about your theme. Display tag
`<listSelectorColor>` - the hex color to use for the "selector bar" on the GuiGameList. Default is `000000FF`. `<listSelectorColor>` - the hex color to use for the "selector bar" on the GuiGameList. Default is `000000FF`.
`<listSelectedColor>` - the hex color to use for selected text on the GuiGameList. Default is the value of `<listPrimaryColor>`. `<listSelectedColor>` - the hex color to use for selected text on the GuiGameList. Default is zero, which means no change.
`<listLeftAlign />` - if present, the games list names will be left aligned to the value of `<listOffsetX>` (default 0.5). `<listLeftAlign />` - if present, the games list names will be left aligned to the value of `<listOffsetX>` (default 0.5).

3
changelog.txt
View file

@ -1,3 +1,6 @@
January 8, 2012
-Made a value of zero for "list selected color" mean no change.
January 6, 2012 January 6, 2012
-Added <basicTheme> tag support. -Added <basicTheme> tag support.

4
src/components/GuiList.cpp
View file

@ -18,7 +18,7 @@ GuiList<listType>::GuiList(int offsetX, int offsetY, Font* font)
mFont = font; mFont = font;
mSelectorColor = 0x000000FF; mSelectorColor = 0x000000FF;
mSelectedTextColorOverride = 0x0000FFFF; mSelectedTextColorOverride = 0;
mScrollSound = NULL; mScrollSound = NULL;
mDrawCentered = true; mDrawCentered = true;
@ -75,7 +75,7 @@ void GuiList<listType>::onRender()
ListRow row = mRowVector.at((unsigned int)i); ListRow row = mRowVector.at((unsigned int)i);
if(mDrawCentered) if(mDrawCentered)
Renderer::drawCenteredText(row.name, getOffsetX(), y, (mSelection == i) ? mSelectedTextColorOverride : row.color, mFont); Renderer::drawCenteredText(row.name, getOffsetX(), y, (mSelection == i && mSelectedTextColorOverride != 0) ? mSelectedTextColorOverride : row.color, mFont);
else else
Renderer::drawText(row.name, getOffsetX() + mTextOffsetX, y, (mSelection == i) ? mSelectedTextColorOverride : row.color, mFont); Renderer::drawText(row.name, getOffsetX() + mTextOffsetX, y, (mSelection == i) ? mSelectedTextColorOverride : row.color, mFont);

4
src/components/GuiTheme.cpp
View file

@ -79,7 +79,7 @@ void GuiTheme::setDefaults()
mColorMap["primary"] = 0x0000FFFF; mColorMap["primary"] = 0x0000FFFF;
mColorMap["secondary"] = 0x00FF00FF; mColorMap["secondary"] = 0x00FF00FF;
mColorMap["selector"] = 0x000000FF; mColorMap["selector"] = 0x000000FF;
mColorMap["selected"] = 0xFF0000FF; mColorMap["selected"] = 0x00000000;
mColorMap["description"] = 0x0000FFFF; mColorMap["description"] = 0x0000FFFF;
mColorMap["fastSelect"] = 0xFF0000FF; mColorMap["fastSelect"] = 0xFF0000FF;
@ -185,7 +185,7 @@ void GuiTheme::readXML(std::string path)
mColorMap["primary"] = resolveColor(root.child("listPrimaryColor").text().get(), mColorMap["primary"]); mColorMap["primary"] = resolveColor(root.child("listPrimaryColor").text().get(), mColorMap["primary"]);
mColorMap["secondary"] = resolveColor(root.child("listSecondaryColor").text().get(), mColorMap["secondary"]); mColorMap["secondary"] = resolveColor(root.child("listSecondaryColor").text().get(), mColorMap["secondary"]);
mColorMap["selector"] = resolveColor(root.child("listSelectorColor").text().get(), mColorMap["selector"]); mColorMap["selector"] = resolveColor(root.child("listSelectorColor").text().get(), mColorMap["selector"]);
mColorMap["selected"] = resolveColor(root.child("listSelectedColor").text().get(), mColorMap["primary"]); mColorMap["selected"] = resolveColor(root.child("listSelectedColor").text().get(), mColorMap["selected"]);
mColorMap["description"] = resolveColor(root.child("descColor").text().get(), mColorMap["description"]); mColorMap["description"] = resolveColor(root.child("descColor").text().get(), mColorMap["description"]);
mColorMap["fastSelect"] = resolveColor(root.child("fastSelectColor").text().get(), mColorMap["fastSelect"]); mColorMap["fastSelect"] = resolveColor(root.child("fastSelectColor").text().get(), mColorMap["fastSelect"]);