twix/raygui
1
0
Fork 0
mirror of https://github.com/raysan5/raygui.git synced 2026-01-29 10:19:18 -05:00
Code Issues Packages Projects Releases Wiki Activity

Some security checks on font loading

Browse Source
This commit is contained in:
Ray
2018-10-18 17:48:01 +02:00
parent 8c7bd96b19
commit 16193a35b0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
examples/controls_review/controls_review.c
View File

@ -52,12 +52,9 @@ int main()
bool dropDown000EditMode = false; bool dropDown000EditMode = false;
bool dropDown001EditMode = false; bool dropDown001EditMode = false;
//TODO: Substituir DrawText por DrawTextEx y MeasureText por MeasureTextEx
//---------------------------------------------------------------------------------- //----------------------------------------------------------------------------------
Font font = LoadFontEx("fonts/PixelOperator8.ttf", 8, 0, 0); Font font = LoadFontEx("fonts/pixelpoiiz10.ttf", 10, 0, 0);
GuiFont(font); GuiFont(font);
SetTargetFPS(60); SetTargetFPS(60);

9
src/raygui.h
View File

@ -894,9 +894,12 @@ RAYGUIDEF void GuiUnlock(void) { guiState = NORMAL; }
// Define custom gui font // Define custom gui font
RAYGUIDEF void GuiFont(Font font) RAYGUIDEF void GuiFont(Font font)
{ {
guiFont = font; if (font.texture.id > 0)
style[DEFAULT_TEXT_SIZE] = font.baseSize; {
style[DEFAULT_TEXT_SPACING] = 1; guiFont = font;
style[DEFAULT_TEXT_SIZE] = font.baseSize;
style[DEFAULT_TEXT_SPACING] = 1;
}
} }
// Set gui controls alpha global state // Set gui controls alpha global state