rubenwardy/TGUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduced minimum SFML version from 2.4.0 to 2.3.0

Browse Source
This commit is contained in:
Bruno Van de Velde 2017-03-29 18:25:32 +02:00
parent faf04e0d97
commit e058a1c6fc
4 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.appveyor.yml
View File

@ -23,7 +23,7 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013
SFML_ROOT: C:\SFML-VS2013 SFML_ROOT: C:\SFML-VS2013
SFML_VERSION: 2.4.0 SFML_VERSION: 2.3
GENERATOR: Visual Studio 12 2013 GENERATOR: Visual Studio 12 2013
BUILD_TYPE: Release BUILD_TYPE: Release
SHARED_LIBS: TRUE SHARED_LIBS: TRUE

6
src/TGUI/Font.cpp
View File

@ -114,7 +114,13 @@ namespace tgui
const sf::Glyph& Font::getGlyph(sf::Uint32 codePoint, unsigned int characterSize, bool bold, float outlineThickness) const const sf::Glyph& Font::getGlyph(sf::Uint32 codePoint, unsigned int characterSize, bool bold, float outlineThickness) const
{ {
assert(m_font != nullptr); assert(m_font != nullptr);
#if SFML_VERSION_MAJOR > 2 || (SFML_VERSION_MAJOR == 2 && SFML_VERSION_MINOR >= 4)
return m_font->getGlyph(codePoint, characterSize, bold, outlineThickness); return m_font->getGlyph(codePoint, characterSize, bold, outlineThickness);
#else
(void)outlineThickness;
return m_font->getGlyph(codePoint, characterSize, bold);
#endif
} }
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

10
src/TGUI/Text.cpp
View File

@ -74,7 +74,12 @@ namespace tgui
void Text::setColor(Color color) void Text::setColor(Color color)
{ {
m_color = color; m_color = color;
#if SFML_VERSION_MAJOR > 2 || (SFML_VERSION_MAJOR == 2 && SFML_VERSION_MINOR >= 4)
m_text.setFillColor(Color::calcColorOpacity(color, m_opacity)); m_text.setFillColor(Color::calcColorOpacity(color, m_opacity));
#else
m_text.setColor(Color::calcColorOpacity(color, m_opacity));
#endif
} }
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -89,7 +94,12 @@ namespace tgui
void Text::setOpacity(float opacity) void Text::setOpacity(float opacity)
{ {
m_opacity = opacity; m_opacity = opacity;
#if SFML_VERSION_MAJOR > 2 || (SFML_VERSION_MAJOR == 2 && SFML_VERSION_MINOR >= 4)
m_text.setFillColor(Color::calcColorOpacity(m_color, opacity)); m_text.setFillColor(Color::calcColorOpacity(m_color, opacity));
#else
m_text.setColor(Color::calcColorOpacity(m_color, opacity));
#endif
} }
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

2
tests/travis_linux_tests.sh
View File

@ -1,6 +1,6 @@
set -eo pipefail set -eo pipefail
export SFML_VERSION=2.4.0 export SFML_VERSION=2.3
export SFML_ROOT=$HOME/SFML-${SFML_VERSION}_LINUX export SFML_ROOT=$HOME/SFML-${SFML_VERSION}_LINUX
export DISPLAY=:99.0 export DISPLAY=:99.0
sh -e /etc/init.d/xvfb start sh -e /etc/init.d/xvfb start