commit e9aead09cb09db09864b24f40172f312f262caaf
author ocornut <omarcornut@gmail.com> Sat Nov 29 00:04:05 2014 +0000
committer ocornut <omarcornut@gmail.com> Sat Nov 29 00:04:05 2014 +0000
tree 0982b31b9c6ac46398b5d0f6ae5348893f464f3c
parent e4a79e9fc8564f826bc7f58b36164014f6842a68

Remove unneeded extra parameter from ImFont::FindGlyph()

imgui.cpp

diff --git a/imgui.cpp b/imgui.cpp
index 0d92e5b..b687177 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -5821,7 +5821,7 @@
         IndexLookup[Glyphs[i].Id] = (int)i;
 }
 
-const ImFont::FntGlyph* ImFont::FindGlyph(unsigned short c, const ImFont::FntGlyph* fallback) const
+const ImFont::FntGlyph* ImFont::FindGlyph(unsigned short c) const
 {
     if (c < (int)IndexLookup.size())
     {
@@ -5829,7 +5829,7 @@
         if (i >= 0 && i < (int)GlyphsCount)
             return &Glyphs[i];
     }
-    return fallback;
+    return FallbackGlyph;
 }
 
 // Convert UTF-8 to 32-bits character, process single character input.
@@ -6045,7 +6045,7 @@
         }
         else
         {
-            if (const FntGlyph* glyph = FindGlyph((unsigned short)c, FallbackGlyph))
+            if (const FntGlyph* glyph = FindGlyph((unsigned short)c))
                 char_width = (glyph->XAdvance + Info->SpacingHoriz) * scale;
         }
 
@@ -6158,7 +6158,7 @@
             if (const FntGlyph* glyph = FindGlyph((unsigned short)' '))
                 char_width = (glyph->XAdvance + Info->SpacingHoriz) * 4 * scale;
         }
-        else if (const FntGlyph* glyph = FindGlyph((unsigned short)c, FallbackGlyph))
+        else if (const FntGlyph* glyph = FindGlyph((unsigned short)c))
         {
             char_width = (glyph->XAdvance + Info->SpacingHoriz) * scale;
         }
@@ -6216,7 +6216,7 @@
         }
         else
         {
-            if (const FntGlyph* glyph = FindGlyph((unsigned short)c, FallbackGlyph))
+            if (const FntGlyph* glyph = FindGlyph((unsigned short)c))
                 char_width = (glyph->XAdvance + Info->SpacingHoriz) * scale;
         }
 
@@ -6309,7 +6309,7 @@
             if (const FntGlyph* glyph = FindGlyph((unsigned short)' '))
                 char_width += (glyph->XAdvance + Info->SpacingHoriz) * 4 * scale;
         }
-        else if (const FntGlyph* glyph = FindGlyph((unsigned short)c, FallbackGlyph))
+        else if (const FntGlyph* glyph = FindGlyph((unsigned short)c))
         {
             char_width = (glyph->XAdvance + Info->SpacingHoriz) * scale;
             if (c != ' ')

imgui.h

diff --git a/imgui.h b/imgui.h
index cf11b60..419631d 100644
--- a/imgui.h
+++ b/imgui.h
@@ -726,7 +726,7 @@
     IMGUI_API bool              LoadFromFile(const char* filename);
     IMGUI_API void              Clear();
     IMGUI_API void              BuildLookupTable();
-    IMGUI_API const FntGlyph*   FindGlyph(unsigned short c, const FntGlyph* fallback = NULL) const;
+    IMGUI_API const FntGlyph*   FindGlyph(unsigned short c) const;
     IMGUI_API float             GetFontSize() const { return (float)Info->FontSize; } // before scale!
     IMGUI_API bool              IsLoaded() const { return Info != NULL && Common != NULL && Glyphs != NULL; }