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

Fixed lines about opacity that were missed with the original regular expression

0.8
Bruno Van de Velde 2015-09-10 01:16:39 +02:00
parent 921b716053
commit 52f7921c48
11 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/TGUI/Widget.cpp
View File

@ -193,7 +193,7 @@ namespace tgui
{
case ShowAnimationType::Fade:
{
m_showAnimations.push_back(std::make_shared<priv::FadeAnimation>(shared_from_this(), 0, getOpacity(), duration));
m_showAnimations.push_back(std::make_shared<priv::FadeAnimation>(shared_from_this(), 0.f, getOpacity(), duration));
setOpacity(0);
break;
}
@ -265,7 +265,7 @@ namespace tgui
{
case ShowAnimationType::Fade:
{
m_showAnimations.push_back(std::make_shared<priv::FadeAnimation>(shared_from_this(), opacity, 0, duration, [=](){ hide(); setOpacity(opacity); }));
m_showAnimations.push_back(std::make_shared<priv::FadeAnimation>(shared_from_this(), opacity, 0.f, duration, [=](){ hide(); setOpacity(opacity); }));
break;
}
case ShowAnimationType::Scale:

4
src/TGUI/Widgets/ChildWindow.cpp
View File

@ -181,8 +181,8 @@ namespace tgui
m_closeButton->setOpacity(m_opacity);
m_iconTexture.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureTitleBar.setColor(sf::Color(255, 255, 255, m_opacity));
m_iconTexture.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureTitleBar.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
m_titleText.setTextColor(calcColorOpacity(getRenderer()->m_titleColor, getOpacity()));
}

8
src/TGUI/Widgets/ComboBox.cpp
View File

@ -393,10 +393,10 @@ namespace tgui
m_listBox->setOpacity(m_opacity);
getRenderer()->m_textureArrowUpNormal.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureArrowDownNormal.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureArrowUpHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureArrowDownHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureArrowUpNormal.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureArrowDownNormal.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureArrowUpHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureArrowDownHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
m_text.setTextColor(calcColorOpacity(getRenderer()->m_textColor, getOpacity()));
}

6
src/TGUI/Widgets/EditBox.cpp
View File

@ -394,9 +394,9 @@ namespace tgui
{
ClickableWidget::setOpacity(opacity);
getRenderer()->m_textureNormal.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureFocused.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureNormal.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureFocused.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
m_textBeforeSelection.setColor(calcColorOpacity(getRenderer()->m_textColor, getOpacity()));
m_textAfterSelection.setColor(calcColorOpacity(getRenderer()->m_textColor, getOpacity()));

4
src/TGUI/Widgets/Knob.cpp
View File

@ -202,8 +202,8 @@ namespace tgui
{
Widget::setOpacity(opacity);
getRenderer()->m_backgroundTexture.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_foregroundTexture.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_backgroundTexture.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_foregroundTexture.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

4
src/TGUI/Widgets/ProgressBar.cpp
View File

@ -251,8 +251,8 @@ namespace tgui
{
ClickableWidget::setOpacity(opacity);
getRenderer()->m_textureBack.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureFront.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureBack.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureFront.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
m_textBack.setTextColor(calcColorOpacity(getRenderer()->m_textColorBack, getOpacity()));
m_textFront.setTextColor(calcColorOpacity(getRenderer()->m_textColorFront, getOpacity()));

10
src/TGUI/Widgets/RadioButton.cpp
View File

@ -187,11 +187,11 @@ namespace tgui
{
Widget::setOpacity(opacity);
getRenderer()->m_textureUnchecked.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureChecked.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureUncheckedHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureCheckedHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureFocused.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureUnchecked.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureChecked.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureUncheckedHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureCheckedHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureFocused.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
if (m_mouseHover)
m_text.setTextColor(calcColorOpacity(getRenderer()->m_textColorHover, getOpacity()));

16
src/TGUI/Widgets/Scrollbar.cpp
View File

@ -289,17 +289,17 @@ namespace tgui
{
Widget::setOpacity(opacity);
getRenderer()->m_textureTrackNormal.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureTrackHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureTrackNormal.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureTrackHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureThumbNormal.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureThumbHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureThumbNormal.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureThumbHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureArrowUpNormal.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureArrowUpHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureArrowUpNormal.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureArrowUpHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureArrowDownNormal.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureArrowDownHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureArrowDownNormal.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureArrowDownHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

8
src/TGUI/Widgets/Slider.cpp
View File

@ -234,10 +234,10 @@ namespace tgui
{
Widget::setOpacity(opacity);
getRenderer()->m_textureTrackNormal.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureTrackHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureThumbNormal.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureThumbHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureTrackNormal.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureTrackHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureThumbNormal.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureThumbHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

8
src/TGUI/Widgets/SpinButton.cpp
View File

@ -184,10 +184,10 @@ namespace tgui
{
ClickableWidget::setOpacity(opacity);
getRenderer()->m_textureArrowUpNormal.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureArrowUpHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureArrowDownNormal.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureArrowDownHover.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureArrowUpNormal.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureArrowUpHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureArrowDownNormal.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureArrowDownHover.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

8
src/TGUI/Widgets/Tab.cpp
View File

@ -387,14 +387,14 @@ namespace tgui
if (getRenderer()->m_textureNormal.isLoaded() && getRenderer()->m_textureSelected.isLoaded())
{
getRenderer()->m_textureNormal.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureSelected.setColor(sf::Color(255, 255, 255, m_opacity));
getRenderer()->m_textureNormal.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
getRenderer()->m_textureSelected.setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
for (auto it = getRenderer()->m_texturesNormal.begin(); it != getRenderer()->m_texturesNormal.end(); ++it)
it->setColor(sf::Color(255, 255, 255, m_opacity));
it->setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
for (auto it = getRenderer()->m_texturesSelected.begin(); it != getRenderer()->m_texturesSelected.end(); ++it)
it->setColor(sf::Color(255, 255, 255, m_opacity));
it->setColor({255, 255, 255, static_cast<sf::Uint8>(m_opacity * 255)});
}
for (auto& tabText : m_tabTexts)