GuiGetFont fix.

This commit is contained in:
jussi
2024-02-22 01:10:22 +02:00
parent 178196b0ff
commit 04d2a7df47
8 changed files with 19 additions and 11 deletions

View File

@@ -119,6 +119,7 @@ int lguiGuiSetFont( lua_State* L ) {
Font* font = uluaGetFont( L, 1 );
GuiSetFont( *font );
state->guiDefaultFont = GuiGetFont();
return 0;
}
@@ -126,12 +127,12 @@ int lguiGuiSetFont( lua_State* L ) {
/*
> font = RL.GuiGetFont()
Get gui custom font (global state)
Get gui custom font (global state). Return as lightuserdata
- Success return Font
*/
int lguiGuiGetFont( lua_State* L ) {
uluaPushFont( L, GuiGetFont() );
lua_pushlightuserdata( L, &state->guiDefaultFont );
return 1;
}
@@ -151,6 +152,7 @@ int lguiGuiSetStyle( lua_State* L ) {
int value = luaL_checkinteger( L, 3 );
GuiSetStyle( control, property, value );
state->guiDefaultFont = GuiGetFont();
return 0;
}
@@ -190,6 +192,7 @@ int lguiGuiLoadStyle( lua_State* L ) {
return 1;
}
state->guiDefaultFont = GuiGetFont();
TraceLog( state->logLevelInvalid, "Invalid file '%s'", lua_tostring( L, 1 ) );
lua_pushnil( L );
@@ -203,6 +206,7 @@ Load style default over global style
*/
int lguiGuiLoadStyleDefault( lua_State* L ) {
GuiLoadStyleDefault();
state->guiDefaultFont = GuiGetFont();
return 0;
}

View File

@@ -29,6 +29,7 @@ bool stateInit( int argn, const char** argc, const char* exePath ) {
state->run = luaInit( argn, argc );
}
state->defaultFont = GetFontDefault();
state->guiDefaultFont = GuiGetFont();
state->defaultMaterial = LoadMaterialDefault();
state->defaultTexture = (Texture){ 1, 1, 1, 1, 7 };
state->RLGLcurrentShaderLocs = malloc( RL_MAX_SHADER_LOCATIONS * sizeof( int ) );