q3k
/
extremetuxracer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Replaced deprecated sf::Text::setColor() calls by 

sf::Text::setFillColor() and sf::Text::setOutlineColor()


git-svn-id: https://svn.code.sf.net/p/extremetuxracer/code/trunk@685 0420edf4-82e4-42fc-9478-35b55e6d67a3
master
cazfi 2016-11-13 20:21:43 +00:00
parent 692c81e49b
commit cd24a9dd0f
4 changed files with 63 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/credits.cpp
View File

@ -79,10 +79,13 @@ void CCredits::DrawCreditsText(float time_step) {
if (offs > h || offs < -100.f) // Draw only visible lines
continue;
if (i->col == 0)
text.setColor(colWhite);
else
text.setColor(colDYell);
if (i->col == 0) {
text.setFillColor(colWhite);
text.setOutlineColor(colWhite);
} else {
text.setFillColor(colDYell);
text.setOutlineColor(colDYell);
}
text.setCharacterSize(FT.AutoSizeN(i->size)+1);
text.setString(i->text);
text.setPosition((Winsys.resolution.width - text.getLocalBounds().width) / 2, offs);

3
src/font.cpp
View File

@ -201,7 +201,8 @@ void CFont::DrawText(float x, float y, const sf::String& text, std::size_t font,
if (x == CENTER)
x = (Winsys.resolution.width - temp.getLocalBounds().width) / 2;
temp.setPosition(x, y);
temp.setColor(curr_col);
temp.setFillColor(curr_col);
temp.setOutlineColor(curr_col);
Winsys.draw(temp);
}

81
src/gui.cpp
View File

@ -83,15 +83,19 @@ TLabel::TLabel(const sf::String& string, int x, int y, const sf::Color& color)
text.setPosition((Winsys.resolution.width - text.getLocalBounds().width) / 2, y);
else
text.setPosition(x, y);
text.setColor(color);
text.setFillColor(color);
text.setOutlineColor(color);
}
void TLabel::Focussed(bool masterFocus) {
focus = masterFocus && active;
if (focus)
text.setColor(colDYell);
else
text.setColor(colWhite);
if (focus) {
text.setFillColor(colDYell);
text.setOutlineColor(colDYell);
} else {
text.setFillColor(colWhite);
text.setOutlineColor(colWhite);
}
}
void TLabel::Draw() const {
@ -114,10 +118,13 @@ TFramedText::TFramedText(int x, int y, int width, int height, int line, const sf
, text(string, FT.getCurrentFont(), ftsize)
, borderFocus(borderFocus_) {
text.setPosition(x + line + 20, y + line);
if (!borderFocus)
text.setColor(colWhite);
else
text.setColor(colDYell);
if (!borderFocus) {
text.setFillColor(colWhite);
text.setOutlineColor(colWhite);
} else {
text.setFillColor(colDYell);
text.setOutlineColor(colDYell);
}
frame.setPosition(x + line, y + line);
frame.setOutlineThickness(line);
frame.setFillColor(backcol);
@ -125,24 +132,32 @@ TFramedText::TFramedText(int x, int y, int width, int height, int line, const sf
}
void TFramedText::Activated() {
if (!active)
text.setColor(colLGrey);
else if (borderFocus || focus)
text.setColor(colDYell);
else
text.setColor(colWhite);
if (!active) {
text.setFillColor(colLGrey);
text.setOutlineColor(colLGrey);
} else if (borderFocus || focus) {
text.setFillColor(colDYell);
text.setOutlineColor(colDYell);
} else {
text.setFillColor(colWhite);
text.setOutlineColor(colWhite);
}
}
void TFramedText::Focussed(bool masterFocus) {
focus = masterFocus && active;
if (focus) {
frame.setOutlineColor(colDYell);
if (!borderFocus)
text.setColor(colDYell);
if (!borderFocus) {
text.setFillColor(colDYell);
text.setOutlineColor(colDYell);
}
} else {
frame.setOutlineColor(colWhite);
if (!borderFocus)
text.setColor(colWhite);
if (!borderFocus) {
text.setFillColor(colWhite);
text.setOutlineColor(colWhite);
}
}
}
@ -171,10 +186,13 @@ TTextButton::TTextButton(int x, int y, const sf::String& text_, int ftsize)
}
void TTextButton::Focussed() {
if (focus)
text.setColor(colDYell);
else
text.setColor(colWhite);
if (focus) {
text.setFillColor(colDYell);
text.setOutlineColor(colDYell);
} else {
text.setFillColor(colWhite);
text.setOutlineColor(colWhite);
}
}
void TTextButton::Draw() const {
@ -240,10 +258,12 @@ void TTextField::SetCursorPos(std::size_t new_pos) {
void TTextField::Focussed() {
if (focus) {
text.setColor(colDYell);
text.setFillColor(colDYell);
text.setOutlineColor(colDYell);
frame.setOutlineColor(colDYell);
} else {
text.setColor(colWhite);
text.setFillColor(colWhite);
text.setOutlineColor(colWhite);
frame.setOutlineColor(colWhite);
}
}
@ -312,10 +332,13 @@ void TCheckbox::SetPosition(int x, int y) {
}
void TCheckbox::Focussed() {
if (focus)
text.setColor(colDYell);
else
text.setColor(colWhite);
if (focus) {
text.setFillColor(colDYell);
text.setOutlineColor(colDYell);
} else {
text.setFillColor(colWhite);
text.setOutlineColor(colWhite);
}
}
void TCheckbox::Draw() const {

3
src/splash_screen.cpp
View File

@ -100,7 +100,8 @@ void CSplashScreen::Loop(float timestep) {
FT.AutoSizeN(6);
int top = AutoYPosN(60);
Failure = new sf::Text(reason, FT.getCurrentFont(), FT.GetSize());
Failure->setColor(colDRed);
Failure->setFillColor(colDRed);
Failure->setOutlineColor(colDRed);
Failure->setPosition((Winsys.resolution.width - Failure->getLocalBounds().width) / 2, top);
}
}