3party/raygui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

REVIEWED: White rectangle assignment

Browse Source
This commit is contained in:
Ray 2023-09-10 19:57:49 +02:00
parent 7417b308af
commit b9c28b4a3c
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/raygui.h
View File

@ -1514,8 +1514,6 @@ void GuiSetFont(Font font)
if (!guiStyleLoaded) GuiLoadStyleDefault(); if (!guiStyleLoaded) GuiLoadStyleDefault();
guiFont = font; guiFont = font;
GuiSetStyle(DEFAULT, TEXT_SIZE, font.baseSize);
GuiSetStyle(DEFAULT, TEXT_LINE_SPACING, (int)(1.5f*font.baseSize));
} }
} }
@ -4505,18 +4503,17 @@ static void GuiLoadStyleFromMemory(const unsigned char *fileData, int dataSize)
fileDataPtr += 16; fileDataPtr += 16;
} }
} }
// Set font texture source rectangle to be used as white texture to draw shapes
// NOTE: It makes possible to draw shapes and text (full UI) in a single draw call
if ((fontWhiteRec.x > 0) &&
(fontWhiteRec.y > 0) &&
(fontWhiteRec.width > 0) &&
(fontWhiteRec.height > 0)) SetShapesTexture(font.texture, fontWhiteRec);
} }
else font = GetFontDefault(); // Fallback in case of errors loading font atlas texture else font = GetFontDefault(); // Fallback in case of errors loading font atlas texture
GuiSetFont(font); GuiSetFont(font);
// Set font texture source rectangle to be used as white texture to draw shapes
// NOTE: It makes possible to draw shapes and text (full UI) in a single draw call
if ((fontWhiteRec.x > 0) &&
(fontWhiteRec.y > 0) &&
(fontWhiteRec.width > 0) &&
(fontWhiteRec.height > 0)) SetShapesTexture(font.texture, fontWhiteRec);
} }
#endif #endif
} }