Fixed some minor warnings when building with VS2015
parent
236d08cf7f
commit
6149e73e4f
|
@ -1476,10 +1476,10 @@ void GuiBuilder::addPropertyValueTextStyle(const std::string& property, const sf
|
||||||
auto checkBoxStrikeThrough = textStyleWindow->get<tgui::CheckBox>("CheckBoxStrikeThrough");
|
auto checkBoxStrikeThrough = textStyleWindow->get<tgui::CheckBox>("CheckBoxStrikeThrough");
|
||||||
|
|
||||||
unsigned int style = tgui::Deserializer::deserialize(tgui::ObjectConverter::Type::TextStyle, value).getTextStyle();
|
unsigned int style = tgui::Deserializer::deserialize(tgui::ObjectConverter::Type::TextStyle, value).getTextStyle();
|
||||||
checkBoxBold->setChecked(style & sf::Text::Style::Bold);
|
checkBoxBold->setChecked((style & sf::Text::Style::Bold) != 0);
|
||||||
checkBoxItalic->setChecked(style & sf::Text::Style::Italic);
|
checkBoxItalic->setChecked((style & sf::Text::Style::Italic) != 0);
|
||||||
checkBoxUnderlined->setChecked(style & sf::Text::Style::Underlined);
|
checkBoxUnderlined->setChecked((style & sf::Text::Style::Underlined) != 0);
|
||||||
checkBoxStrikeThrough->setChecked(style & sf::Text::Style::StrikeThrough);
|
checkBoxStrikeThrough->setChecked((style & sf::Text::Style::StrikeThrough) != 0);
|
||||||
|
|
||||||
auto updateTextStyleProperty = [=]{
|
auto updateTextStyleProperty = [=]{
|
||||||
unsigned int newStyle = 0;
|
unsigned int newStyle = 0;
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
This folder contains the [nanosvg](https://github.com/memononen/nanosvg) headers (commit c1f6e20, downloaded in March 2019). Only minor changes were made to get rid of compiler warnings.
|
This folder contains the [texus/nanosvg](https://github.com/texus/nanosvg) headers, which contain only minor changes to the official [memononen/nanosvg](https://github.com/memononen/nanosvg) library.
|
||||||
|
|
|
@ -804,7 +804,6 @@ static double nsvg__convertToPixels(NSVGparser* p, NSVGcoordinate c, double orig
|
||||||
case NSVG_UNITS_PERCENT: return orig + c.value / 100.0 * length;
|
case NSVG_UNITS_PERCENT: return orig + c.value / 100.0 * length;
|
||||||
default: return c.value;
|
default: return c.value;
|
||||||
}
|
}
|
||||||
return c.value;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static NSVGgradientData* nsvg__findGradientData(NSVGparser* p, const char* id)
|
static NSVGgradientData* nsvg__findGradientData(NSVGparser* p, const char* id)
|
||||||
|
|
Loading…
Reference in New Issue