Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-24 15:50:25 +01:00
Code Releases Wiki Activity

Very minor code/comments tweaks.

Browse Source
This commit is contained in:
ocornut 2015-01-04 22:29:53 +00:00
parent 4905ec46f1
commit 0505995193
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
imgui.cpp
View File

@ -6625,10 +6625,10 @@ void ImFont::RenderText(float size, ImVec2 pos, ImU32 col, const ImVec4& clip_re
if (!text_end) if (!text_end)
text_end = text_begin + strlen(text_begin); text_end = text_begin + strlen(text_begin);
const float line_height = (float)Info->FontSize;
const float scale = size / (float)Info->FontSize; const float scale = size / (float)Info->FontSize;
const float line_height = (float)Info->FontSize * scale;
const float tex_scale_x = 1.0f / (float)Common->ScaleW; const float tex_scale_x = 1.0f / (float)Common->ScaleW;
const float tex_scale_y = 1.0f / (float)(Common->ScaleH); const float tex_scale_y = 1.0f / (float)Common->ScaleH;
const float outline = (float)Info->Outline; const float outline = (float)Info->Outline;
// Align to be pixel perfect // Align to be pixel perfect
@ -6658,7 +6658,7 @@ void ImFont::RenderText(float size, ImVec2 pos, ImU32 col, const ImVec4& clip_re
if (s >= word_wrap_eol) if (s >= word_wrap_eol)
{ {
x = pos.x; x = pos.x;
y += line_height * scale; y += line_height;
word_wrap_eol = NULL; word_wrap_eol = NULL;
// Wrapping skips upcoming blanks // Wrapping skips upcoming blanks
@ -6679,7 +6679,7 @@ void ImFont::RenderText(float size, ImVec2 pos, ImU32 col, const ImVec4& clip_re
if (c == '\n') if (c == '\n')
{ {
x = pos.x; x = pos.x;
y += line_height * scale; y += line_height;
continue; continue;
} }

2
imgui.h
View File

@ -745,7 +745,7 @@ struct ImFont
// Settings // Settings
float Scale; // = 1.0f // Base font scale, multiplied by the per-window font scale which you can adjust with SetFontScale() float Scale; // = 1.0f // Base font scale, multiplied by the per-window font scale which you can adjust with SetFontScale()
ImVec2 DisplayOffset; // = (0.0f,0.0f // Offset font rendering by xx pixels ImVec2 DisplayOffset; // = (0.0f,0.0f) // Offset font rendering by xx pixels
ImVec2 TexUvForWhite; // = (0.0f,0.0f) // Font texture must have a white pixel at this UV coordinate. Adjust if you are using custom texture. ImVec2 TexUvForWhite; // = (0.0f,0.0f) // Font texture must have a white pixel at this UV coordinate. Adjust if you are using custom texture.
ImWchar FallbackChar; // = '?' // Replacement glyph is one isn't found. ImWchar FallbackChar; // = '?' // Replacement glyph is one isn't found.