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

Fixed some minor warnings when building with VS2015

0.8
Bruno Van de Velde 2019-05-28 18:52:56 +02:00
parent 236d08cf7f
commit 6149e73e4f
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gui-builder/src/GuiBuilder.cpp
View File

@ -1476,10 +1476,10 @@ void GuiBuilder::addPropertyValueTextStyle(const std::string& property, const sf
auto checkBoxStrikeThrough = textStyleWindow->get<tgui::CheckBox>("CheckBoxStrikeThrough");
unsigned int style = tgui::Deserializer::deserialize(tgui::ObjectConverter::Type::TextStyle, value).getTextStyle();
checkBoxBold->setChecked(style & sf::Text::Style::Bold);
checkBoxItalic->setChecked(style & sf::Text::Style::Italic);
checkBoxUnderlined->setChecked(style & sf::Text::Style::Underlined);
checkBoxStrikeThrough->setChecked(style & sf::Text::Style::StrikeThrough);
checkBoxBold->setChecked((style & sf::Text::Style::Bold) != 0);
checkBoxItalic->setChecked((style & sf::Text::Style::Italic) != 0);
checkBoxUnderlined->setChecked((style & sf::Text::Style::Underlined) != 0);
checkBoxStrikeThrough->setChecked((style & sf::Text::Style::StrikeThrough) != 0);
auto updateTextStyleProperty = [=]{
unsigned int newStyle = 0;

2
include/TGUI/nanosvg/README.txt
View File

@ -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.

1
include/TGUI/nanosvg/nanosvg.h
View File

@ -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;
default: return c.value;
}
return c.value;
}
static NSVGgradientData* nsvg__findGradientData(NSVGparser* p, const char* id)