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

Added a built-in default font

0.8
Bruno Van de Velde 2016-01-04 20:10:16 +01:00
parent 98f64f0158
commit 843f602a4e
3 changed files with 223 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
include/TGUI/DefaultFont.hpp Normal file
View File

File diff suppressed because one or more lines are too long

13
src/TGUI/Gui.cpp
View File

@ -25,6 +25,7 @@
#include <TGUI/Clipboard.hpp>
#include <TGUI/Widgets/ToolTip.hpp>
#include <TGUI/Gui.hpp>
#include <TGUI/DefaultFont.hpp>
#include <SFML/OpenGL.hpp>
@ -41,6 +42,10 @@ namespace tgui
m_accessToWindow(false)
{
m_container->m_focused = true;
sf::Font defaultFont;
if (defaultFont.loadFromMemory(defaultFontBytes, sizeof(defaultFontBytes)))
setFont(defaultFont);
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -55,6 +60,10 @@ namespace tgui
Clipboard::setWindowHandle(window.getSystemHandle());
setView(window.getDefaultView());
sf::Font defaultFont;
if (defaultFont.loadFromMemory(defaultFontBytes, sizeof(defaultFontBytes)))
setFont(defaultFont);
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -67,6 +76,10 @@ namespace tgui
m_container->m_focused = true;
setView(window.getDefaultView());
sf::Font defaultFont;
if (defaultFont.loadFromMemory(defaultFontBytes, sizeof(defaultFontBytes)))
setFont(defaultFont);
}
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

6
tests/Container.cpp
View File

@ -27,7 +27,6 @@
TEST_CASE("[Container]") {
auto container = std::make_shared<tgui::Gui>();
container->setFont("resources/DroidSansArmenian.ttf");
auto widget1 = std::make_shared<tgui::EditBox>();
auto widget2 = std::make_shared<tgui::Panel>();
@ -40,6 +39,11 @@ TEST_CASE("[Container]") {
widget2->add(widget4, "w4");
widget2->add(widget5, "w5");
SECTION("default font in gui") {
REQUIRE(std::make_shared<tgui::Gui>()->getFont() != nullptr);
REQUIRE(std::make_shared<tgui::Panel>()->getFont() == nullptr);
}
SECTION("add") {
container->removeAllWidgets();