** DO NOT MERGE ** Crude font demo.

ocornut · Jan 26, 2021 · a3415c9 · a3415c9
1 parent 131fd5f
commit a3415c9
Show file tree

Hide file tree

Showing 21 changed files with 177 additions and 7 deletions.
diff --git a/examples/example_allegro5/main.cpp b/examples/example_allegro5/main.cpp
@@ -78,10 +78,14 @@ int main(int, char**)
             }
         }
 
+        ImGui::UpdateFontDemo();
+
         // Start the Dear ImGui frame
         ImGui_ImplAllegro5_NewFrame();
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_apple_metal/main.mm b/examples/example_apple_metal/main.mm
@@ -252,13 +252,17 @@ - (void)drawInMTKView:(MTKView*)view
         id <MTLRenderCommandEncoder> renderEncoder = [commandBuffer renderCommandEncoderWithDescriptor:renderPassDescriptor];
         [renderEncoder pushDebugGroup:@"ImGui demo"];
 
+        ImGui::UpdateFontDemo();
+
         // Start the Dear ImGui frame
         ImGui_ImplMetal_NewFrame(renderPassDescriptor);
 #if TARGET_OS_OSX
         ImGui_ImplOSX_NewFrame(view);
 #endif
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_apple_opengl2/main.mm b/examples/example_apple_opengl2/main.mm
@@ -41,11 +41,15 @@ -(void)prepareOpenGL
 
 -(void)updateAndDrawDemoView
 {
+    ImGui::UpdateFontDemo();
+
     // Start the Dear ImGui frame
 	ImGui_ImplOpenGL2_NewFrame();
 	ImGui_ImplOSX_NewFrame(self);
     ImGui::NewFrame();
 
+    ImGui::ShowFontDemoWindow();
+
     // Our state (make them static = more or less global) as a convenience to keep the example terse.
     static bool show_demo_window = true;
     static bool show_another_window = false;

diff --git a/examples/example_emscripten_opengl3/main.cpp b/examples/example_emscripten_opengl3/main.cpp
@@ -121,11 +121,15 @@ void main_loop(void* arg)
         // Capture events here, based on io.WantCaptureMouse and io.WantCaptureKeyboard
     }
 
+    ImGui::UpdateFontDemo();
+
     // Start the Dear ImGui frame
     ImGui_ImplOpenGL3_NewFrame();
     ImGui_ImplSDL2_NewFrame(g_Window);
     ImGui::NewFrame();
 
+    ImGui::ShowFontDemoWindow();
+
     // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
     if (show_demo_window)
         ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_glfw_metal/main.mm b/examples/example_glfw_metal/main.mm
@@ -106,11 +106,15 @@ int main(int, char**)
             id <MTLRenderCommandEncoder> renderEncoder = [commandBuffer renderCommandEncoderWithDescriptor:renderPassDescriptor];
             [renderEncoder pushDebugGroup:@"ImGui demo"];
 
+            ImGui::UpdateFontDemo();
+
             // Start the Dear ImGui frame
             ImGui_ImplMetal_NewFrame(renderPassDescriptor);
             ImGui_ImplGlfw_NewFrame();
             ImGui::NewFrame();
 
+            ImGui::ShowFontDemoWindow();
+
             // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
             if (show_demo_window)
                 ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_glfw_opengl2/main.cpp b/examples/example_glfw_opengl2/main.cpp
@@ -85,11 +85,15 @@ int main(int, char**)
         // Generally you may always pass all inputs to dear imgui, and hide them from your application based on those two flags.
         glfwPollEvents();
 
+        ImGui::UpdateFontDemo();
+
         // Start the Dear ImGui frame
         ImGui_ImplOpenGL2_NewFrame();
         ImGui_ImplGlfw_NewFrame();
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_glfw_opengl3/main.cpp b/examples/example_glfw_opengl3/main.cpp
@@ -127,7 +127,7 @@ int main(int, char**)
     // - Read 'docs/FONTS.md' for more instructions and details.
     // - Remember that in C/C++ if you want to include a backslash \ in a string literal you need to write a double backslash \\ !
     //io.Fonts->AddFontDefault();
-    //io.Fonts->AddFontFromFileTTF("../../misc/fonts/Roboto-Medium.ttf", 16.0f);
+    io.Fonts->AddFontFromFileTTF("../../misc/fonts/Roboto-Medium.ttf", 16.0f);
     //io.Fonts->AddFontFromFileTTF("../../misc/fonts/Cousine-Regular.ttf", 15.0f);
     //io.Fonts->AddFontFromFileTTF("../../misc/fonts/DroidSans.ttf", 16.0f);
     //io.Fonts->AddFontFromFileTTF("../../misc/fonts/ProggyTiny.ttf", 10.0f);
@@ -149,11 +149,15 @@ int main(int, char**)
         // Generally you may always pass all inputs to dear imgui, and hide them from your application based on those two flags.
         glfwPollEvents();
 
+        ImGui::UpdateFontDemo();
+
         // Start the Dear ImGui frame
         ImGui_ImplOpenGL3_NewFrame();
         ImGui_ImplGlfw_NewFrame();
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_glfw_vulkan/main.cpp b/examples/example_glfw_vulkan/main.cpp
@@ -28,7 +28,7 @@
 
 //#define IMGUI_UNLIMITED_FRAME_RATE
 #ifdef _DEBUG
-#define IMGUI_VULKAN_DEBUG_REPORT
+//#define IMGUI_VULKAN_DEBUG_REPORT
 #endif
 
 static VkAllocationCallbacks*   g_Allocator = NULL;
@@ -480,6 +480,8 @@ int main(int, char**)
             }
         }
 
+        ImGui::UpdateFontDemo();
+
         // Upload Fonts
         if (io.Fonts->IsDirty())
             UpdateFontsTexture(wd);
@@ -525,6 +527,8 @@ int main(int, char**)
         ImGui_ImplGlfw_NewFrame();
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_glut_opengl2/main.cpp b/examples/example_glut_opengl2/main.cpp
@@ -26,6 +26,8 @@ static ImVec4 clear_color = ImVec4(0.45f, 0.55f, 0.60f, 1.00f);
 
 void my_display_code()
 {
+    ImGui::ShowFontDemoWindow();
+
     // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
     if (show_demo_window)
         ImGui::ShowDemoWindow(&show_demo_window);
@@ -66,6 +68,8 @@ void my_display_code()
 
 void glut_display_func()
 {
+    ImGui::UpdateFontDemo();
+
     // Start the Dear ImGui frame
     ImGui_ImplOpenGL2_NewFrame();
     ImGui_ImplGLUT_NewFrame();

diff --git a/examples/example_marmalade/main.cpp b/examples/example_marmalade/main.cpp
@@ -64,10 +64,14 @@ int main(int, char**)
         s3eKeyboardUpdate();
         s3ePointerUpdate();
 
+        ImGui::UpdateFontDemo();
+
         // Start the Dear ImGui frame
         ImGui_Marmalade_NewFrame();
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_sdl_directx11/main.cpp b/examples/example_sdl_directx11/main.cpp
@@ -111,11 +111,15 @@ int main(int, char**)
             }
         }
 
+        ImGui::UpdateFontDemo();
+
         // Start the Dear ImGui frame
         ImGui_ImplDX11_NewFrame();
         ImGui_ImplSDL2_NewFrame(window);
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_sdl_metal/main.mm b/examples/example_sdl_metal/main.mm
@@ -114,11 +114,15 @@ int main(int, char**)
             id <MTLRenderCommandEncoder> renderEncoder = [commandBuffer renderCommandEncoderWithDescriptor:renderPassDescriptor];
             [renderEncoder pushDebugGroup:@"ImGui demo"];
 
+            ImGui::UpdateFontDemo();
+
             // Start the Dear ImGui frame
             ImGui_ImplMetal_NewFrame(renderPassDescriptor);
             ImGui_ImplSDL2_NewFrame(window);
             ImGui::NewFrame();
 
+            ImGui::ShowFontDemoWindow();
+
             // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
             if (show_demo_window)
                 ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_sdl_opengl2/main.cpp b/examples/example_sdl_opengl2/main.cpp
@@ -92,11 +92,15 @@ int main(int, char**)
                 done = true;
         }
 
+        ImGui::UpdateFontDemo();
+
         // Start the Dear ImGui frame
         ImGui_ImplOpenGL2_NewFrame();
         ImGui_ImplSDL2_NewFrame(window);
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_sdl_opengl3/main.cpp b/examples/example_sdl_opengl3/main.cpp
@@ -153,11 +153,15 @@ int main(int, char**)
                 done = true;
         }
 
+        ImGui::UpdateFontDemo();
+
         // Start the Dear ImGui frame
         ImGui_ImplOpenGL3_NewFrame();
         ImGui_ImplSDL2_NewFrame(window);
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_sdl_vulkan/main.cpp b/examples/example_sdl_vulkan/main.cpp
@@ -477,14 +477,17 @@ int main(int, char**)
             }
         }
 
-        if (io.Fonts->IsDirty())
-            UpdateFontsTexture(wd);
+        ImGui::UpdateFontDemo();
 
         // Start the Dear ImGui frame
+        if (io.Fonts->IsDirty())
+            UpdateFontsTexture(wd);
         ImGui_ImplVulkan_NewFrame();
         ImGui_ImplSDL2_NewFrame(window);
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_win32_directx10/main.cpp b/examples/example_win32_directx10/main.cpp
@@ -96,11 +96,15 @@ int main(int, char**)
             continue;
         }
 
+        ImGui::UpdateFontDemo();
+
         // Start the Dear ImGui frame
         ImGui_ImplDX10_NewFrame();
         ImGui_ImplWin32_NewFrame();
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_win32_directx11/main.cpp b/examples/example_win32_directx11/main.cpp
@@ -96,11 +96,15 @@ int main(int, char**)
             continue;
         }
 
+        ImGui::UpdateFontDemo();
+
         // Start the Dear ImGui frame
         ImGui_ImplDX11_NewFrame();
         ImGui_ImplWin32_NewFrame();
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_win32_directx12/main.cpp b/examples/example_win32_directx12/main.cpp
@@ -135,9 +135,7 @@ int main(int, char**)
             continue;
         }
 
-        // Start the Dear ImGui frame
-        ImGui_ImplDX12_NewFrame();
-        ImGui_ImplWin32_NewFrame();
+        ImGui::UpdateFontDemo();
 
         // Upload Fonts
         if (io.Fonts->IsDirty())
@@ -146,8 +144,13 @@ int main(int, char**)
             ImGui_ImplDX12_UpdateFontsTexture();
         }
 
+        // Start the Dear ImGui frame
+        ImGui_ImplDX12_NewFrame();
+        ImGui_ImplWin32_NewFrame();
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/examples/example_win32_directx9/main.cpp b/examples/example_win32_directx9/main.cpp
@@ -94,11 +94,15 @@ int main(int, char**)
             continue;
         }
 
+        ImGui::UpdateFontDemo();
+
         // Start the Dear ImGui frame
         ImGui_ImplDX9_NewFrame();
         ImGui_ImplWin32_NewFrame();
         ImGui::NewFrame();
 
+        ImGui::ShowFontDemoWindow();
+
         // 1. Show the big demo window (Most of the sample code is in ImGui::ShowDemoWindow()! You can browse its code to learn more about Dear ImGui!).
         if (show_demo_window)
             ImGui::ShowDemoWindow(&show_demo_window);

diff --git a/imgui.h b/imgui.h
@@ -277,6 +277,9 @@ namespace ImGui
     IMGUI_API void          ShowUserGuide();                            // add basic help/info block (not a window): how to manipulate ImGui as a end-user (mouse/keyboard controls).
     IMGUI_API const char*   GetVersion();                               // get the compiled version string e.g. "1.80 WIP" (essentially the value for IMGUI_VERSION from the compiled version of imgui.cpp)
 
+    IMGUI_API void          UpdateFontDemo();
+    IMGUI_API void          ShowFontDemoWindow();
+
     // Styles
     IMGUI_API void          StyleColorsDark(ImGuiStyle* dst = NULL);    // new, recommended style (default)
     IMGUI_API void          StyleColorsLight(ImGuiStyle* dst = NULL);   // best used with borders and a custom, thicker font