소스 검색

Updated imgui.

Branimir Karadžić 10 년 전
부모
커밋
a0fed6eeb1
2개의 변경된 파일4개의 추가작업 그리고 4개의 파일을 삭제
  1. 2 2
      3rdparty/ocornut-imgui/imgui.cpp
  2. 2 2
      3rdparty/ocornut-imgui/imgui.h

+ 2 - 2
3rdparty/ocornut-imgui/imgui.cpp

@@ -1,4 +1,4 @@
-// ImGui library v1.41 WIP
+// ImGui library v1.41
 // See ImGui::ShowTestWindow() for sample code.
 // See ImGui::ShowTestWindow() for sample code.
 // Read 'Programmer guide' below for notes on how to setup ImGui in your codebase.
 // Read 'Programmer guide' below for notes on how to setup ImGui in your codebase.
 // Get latest version at https://github.com/ocornut/imgui
 // Get latest version at https://github.com/ocornut/imgui
@@ -10985,7 +10985,7 @@ void ImGui::ShowTestWindow(bool* opened)
 
 
         if (ImGui::TreeNode("Multi-line Text Input"))
         if (ImGui::TreeNode("Multi-line Text Input"))
         {
         {
-            static char text[1024*4] = "// F00F bug\nlabel:\n\tlock cmpxchg8b eax\n";
+            static char text[1024*16] = "// F00F bug\nlabel:\n\tlock cmpxchg8b eax\n";
             ImGui::PushItemWidth(-1.0f);
             ImGui::PushItemWidth(-1.0f);
             ImGui::InputTextMultiline("##source", text, IM_ARRAYSIZE(text), ImVec2(0.f, ImGui::GetTextLineHeight() * 16), ImGuiInputTextFlags_AllowTabInput);
             ImGui::InputTextMultiline("##source", text, IM_ARRAYSIZE(text), ImVec2(0.f, ImGui::GetTextLineHeight() * 16), ImGuiInputTextFlags_AllowTabInput);
             ImGui::PopItemWidth();
             ImGui::PopItemWidth();

+ 2 - 2
3rdparty/ocornut-imgui/imgui.h

@@ -1,4 +1,4 @@
-// ImGui library v1.41 WIP
+// ImGui library v1.41
 // See .cpp file for documentation.
 // See .cpp file for documentation.
 // See ImGui::ShowTestWindow() for sample code.
 // See ImGui::ShowTestWindow() for sample code.
 // Read 'Programmer guide' in .cpp for notes on how to setup ImGui in your codebase.
 // Read 'Programmer guide' in .cpp for notes on how to setup ImGui in your codebase.
@@ -13,7 +13,7 @@
 #include <stdlib.h>         // NULL, malloc, free, qsort, atoi
 #include <stdlib.h>         // NULL, malloc, free, qsort, atoi
 #include <string.h>         // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp
 #include <string.h>         // memset, memmove, memcpy, strlen, strchr, strcpy, strcmp
 
 
-#define IMGUI_VERSION       "1.41 WIP"
+#define IMGUI_VERSION       "1.41"
 
 
 // Define assertion handler.
 // Define assertion handler.
 #ifndef IM_ASSERT
 #ifndef IM_ASSERT