Browse Source

Merge branch 'raysan5:master' into master

pull/4796/head
Jon Daniel 3 months ago
committed by GitHub
parent
commit
369f767c59
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      src/platforms/rcore_desktop_glfw.c
  2. +1
    -1
      src/rtext.c

+ 1
- 1
src/platforms/rcore_desktop_glfw.c View File

@ -1759,7 +1759,7 @@ static void WindowSizeCallback(GLFWwindow *window, int width, int height)
width = (int)(width/GetWindowScaleDPI().x); width = (int)(width/GetWindowScaleDPI().x);
height = (int)(height/GetWindowScaleDPI().y); height = (int)(height/GetWindowScaleDPI().y);
} }
// Set render size // Set render size
CORE.Window.render.width = width; CORE.Window.render.width = width;
CORE.Window.render.height = height; CORE.Window.render.height = height;

+ 1
- 1
src/rtext.c View File

@ -1075,7 +1075,7 @@ bool ExportFontAsCode(Font font, const char *fileName)
byteCount += sprintf(txtData + byteCount, " Image imFont = { fontImageData_%s, %i, %i, 1, %i };\n\n", styleName, image.width, image.height, image.format); byteCount += sprintf(txtData + byteCount, " Image imFont = { fontImageData_%s, %i, %i, 1, %i };\n\n", styleName, image.width, image.height, image.format);
#endif #endif
byteCount += sprintf(txtData + byteCount, " // Load texture from image\n"); byteCount += sprintf(txtData + byteCount, " // Load texture from image\n");
byteCount += sprintf(txtData + byteCount, " if (isGpuReady) font.texture = LoadTextureFromImage(imFont);\n");
byteCount += sprintf(txtData + byteCount, " font.texture = LoadTextureFromImage(imFont);\n");
#if defined(SUPPORT_COMPRESSED_FONT_ATLAS) #if defined(SUPPORT_COMPRESSED_FONT_ATLAS)
byteCount += sprintf(txtData + byteCount, " UnloadImage(imFont); // Uncompressed data can be unloaded from memory\n\n"); byteCount += sprintf(txtData + byteCount, " UnloadImage(imFont); // Uncompressed data can be unloaded from memory\n\n");
#endif #endif

Loading…
Cancel
Save