Permalink
Browse files

Little fixes

  • Loading branch information...
JarrettBillingsley committed Nov 22, 2015
1 parent 5a94c9c commit f1f0702d1cf7c415291fa08366b41d436e862117
Showing with 4 additions and 4 deletions.
  1. +1 −1 samples/imguitest.croc
  2. +1 −1 src/croc/addons/glfw.cpp
  3. +2 −2 src/croc/ext/imgui/imgui.cpp
View
@@ -260,7 +260,7 @@ function doEvents()
break
case "scroll":
imgui.io.setMouseWheel(b > 0 ? 1 : b < 0 ? -1 : 0)
imgui.io.setMouseWheel(b <=> 0)
break
case "key":
View
@@ -996,7 +996,7 @@ while(not window.shouldClose())
\returns an event as specified in the docs for \link{pollEvents}.)"),
"waitEvents", 0
"waitEvents", 1 // 1 so it can be used as an "opApply"
};
word_t _waitEvents(CrocThread* t)
@@ -5651,7 +5651,7 @@ ImVec2 ImBitmapFont::CalcTextSizeA(float size, float max_width, const char* text
const char* s = text_begin;
while (s < text_end)
{
unsigned int c;
unsigned int c = 0;
const int bytes_count = ImTextCharFromUtf8(&c, s, text_end);
s += bytes_count > 0 ? bytes_count : 1; // Handle decoding failure by skipping to next byte
@@ -5780,7 +5780,7 @@ void ImBitmapFont::RenderText(float size, ImVec2 pos, ImU32 col, const ImVec4& c
float y = pos.y;
for (const char* s = text_begin; s < text_end; )
{
unsigned int c;
unsigned int c = 0;
const int bytes_count = ImTextCharFromUtf8(&c, s, text_end);
s += bytes_count > 0 ? bytes_count : 1; // Handle decoding failure by skipping to next byte
if (c >= 0x10000)

0 comments on commit f1f0702

Please sign in to comment.