twix/raygui
1
0
Fork 0
mirror of https://github.com/raysan5/raygui.git synced 2026-01-31 03:09:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

RENAMED: GuiFont() to GuiSetFont()

Browse Source 
ADDED: GuiGetFont()
This commit is contained in:
Ray
2019-08-26 00:56:58 +02:00
parent be2ccc5147
commit 462ba6b373
2 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/controls_test_suite/controls_test_suite.c
View File

@ -90,7 +90,7 @@ int main()
// Custom GUI font loading // Custom GUI font loading
//Font font = LoadFontEx("fonts/rainyhearts16.ttf", 12, 0, 0); //Font font = LoadFontEx("fonts/rainyhearts16.ttf", 12, 0, 0);
//GuiFont(font); //GuiSetFont(font);
bool exitWindow = false; bool exitWindow = false;
bool showMessageBox = false; bool showMessageBox = false;

30
src/raygui.h
View File

@ -383,9 +383,11 @@ RAYGUIDEF void GuiDisable(void); // Disab
RAYGUIDEF void GuiLock(void); // Lock gui controls (global state) RAYGUIDEF void GuiLock(void); // Lock gui controls (global state)
RAYGUIDEF void GuiUnlock(void); // Unlock gui controls (global state) RAYGUIDEF void GuiUnlock(void); // Unlock gui controls (global state)
RAYGUIDEF void GuiState(int state); // Set gui state (global state) RAYGUIDEF void GuiState(int state); // Set gui state (global state)
RAYGUIDEF void GuiFont(Font font); // Set gui custom font (global state)
RAYGUIDEF void GuiFade(float alpha); // Set gui controls alpha (global state), alpha goes from 0.0f to 1.0f RAYGUIDEF void GuiFade(float alpha); // Set gui controls alpha (global state), alpha goes from 0.0f to 1.0f
RAYGUIDEF void GuiSetFont(Font font); // Set gui custom font (global state)
RAYGUIDEF Font GuiGetFont(void); // Get gui custom font (global state)
// Style set/get functions // Style set/get functions
RAYGUIDEF void GuiSetStyle(int control, int property, int value); // Set one style property RAYGUIDEF void GuiSetStyle(int control, int property, int value); // Set one style property
RAYGUIDEF int GuiGetStyle(int control, int property); // Get one style property RAYGUIDEF int GuiGetStyle(int control, int property); // Get one style property
@ -746,8 +748,17 @@ RAYGUIDEF void GuiUnlock(void) { guiLocked = false; }
// Set gui state (global state) // Set gui state (global state)
RAYGUIDEF void GuiState(int state) { guiState = (GuiControlState)state; } RAYGUIDEF void GuiState(int state) { guiState = (GuiControlState)state; }
// Define custom gui font // Set gui controls alpha global state
RAYGUIDEF void GuiFont(Font font) RAYGUIDEF void GuiFade(float alpha)
{
if (alpha < 0.0f) alpha = 0.0f;
else if (alpha > 1.0f) alpha = 1.0f;
guiAlpha = alpha;
}
// Set custom gui font
RAYGUIDEF void GuiSetFont(Font font)
{ {
if (font.texture.id > 0) if (font.texture.id > 0)
{ {
@ -756,13 +767,10 @@ RAYGUIDEF void GuiFont(Font font)
} }
} }
// Set gui controls alpha global state // Get custom gui font
RAYGUIDEF void GuiFade(float alpha) RAYGUIDEF Font GuiGetFont(void)
{ {
if (alpha < 0.0f) alpha = 0.0f; return guiFont;
else if (alpha > 1.0f) alpha = 1.0f;
guiAlpha = alpha;
} }
// Set control style property value // Set control style property value
@ -3998,7 +4006,7 @@ RAYGUIDEF void GuiLoadStyle(const char *fileName)
} }
else font = LoadFontEx(FormatText("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, NULL, 0); else font = LoadFontEx(FormatText("%s/%s", GetDirectoryPath(fileName), fontFileName), fontSize, NULL, 0);
if ((font.texture.id > 0) && (font.charsCount > 0)) GuiFont(font); if ((font.texture.id > 0) && (font.charsCount > 0)) GuiSetFont(font);
} break; } break;
default: break; default: break;
@ -4106,7 +4114,7 @@ RAYGUIDEF void GuiLoadStyle(const char *fileName)
fread(&font.chars[i].advanceX, 1, sizeof(int), rgsFile); fread(&font.chars[i].advanceX, 1, sizeof(int), rgsFile);
} }
GuiFont(font); GuiSetFont(font);
// Set font texture source rectangle to be used as white texture to draw shapes // Set font texture source rectangle to be used as white texture to draw shapes
// NOTE: This way, all gui can be draw using a single draw call // NOTE: This way, all gui can be draw using a single draw call