From 2d68e892a8161112932d08a14d8f36f2d1be2b34 Mon Sep 17 00:00:00 2001 From: omar Date: Mon, 27 May 2019 17:28:18 +0200 Subject: [PATCH] Added full "Dear ImGui" prefix to the title of "Dear ImGui Demo" and "Dear ImGui Metrics" windows. Shortened amount of nodes in columns>tree demo. --- docs/CHANGELOG.txt | 7 ++++--- imgui.cpp | 2 +- imgui_demo.cpp | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index 1ac44f40..830c05be 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -54,12 +54,13 @@ Other Changes: - Scrollbar: Very minor bounding box adjustment to cope with various border size. - Style: Added style.WindowMenuButtonPosition (left/right, defaults to ImGuiDir_Left) to move the collapsing/docking button to the other side of the title bar. -- Style: Made window close button cross is slightly smaller. +- Style: Made window close button cross slightly smaller. - ImFontAtlas: FreeType: Added RasterizerFlags::Monochrome flag to disable font anti-aliasing. (#2545) Combine with RasterizerFlags::MonoHinting for best results. - ImFontGlyphRangesBuilder: Fixed unnecessarily over-sized buffer, which incidentally was also not - fully cleared. Fixed edge case overflow when adding character 0xFFFF. (#2568). [@NIKE3500] -- Add native Mac clipboard copy/paste default implementation in core library to match what we are + fully cleared. Fixed edge-case overflow when adding character 0xFFFF. (#2568). [@NIKE3500] +- Demo: Added full "Dear ImGui" prefix to the title of "Dear ImGui Demo" and "Dear ImGui Metrics" windows. +- Backends: Add native Mac clipboard copy/paste default implementation in core library to match what we are dealing with Win32, and to facilitate integration in custom engines. (#2546) [@andrewwillmott] - Examples/Backends: Don't filter characters under 0x10000 before calling io.AddInputCharacter(), the filtering is done in io.AddInputCharacter() itself. This is in prevision for fuller Unicode diff --git a/imgui.cpp b/imgui.cpp index 4ff123e3..b6f61779 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -9730,7 +9730,7 @@ static void ImeSetInputScreenPosFn_DefaultImpl(int, int) {} void ImGui::ShowMetricsWindow(bool* p_open) { - if (!ImGui::Begin("ImGui Metrics", p_open)) + if (!ImGui::Begin("Dear ImGui Metrics", p_open)) { ImGui::End(); return; diff --git a/imgui_demo.cpp b/imgui_demo.cpp index 11422252..78327e74 100644 --- a/imgui_demo.cpp +++ b/imgui_demo.cpp @@ -246,7 +246,7 @@ void ImGui::ShowDemoWindow(bool* p_open) ImGui::SetNextWindowSize(ImVec2(550, 680), ImGuiCond_FirstUseEver); // Main body of the Demo window starts here. - if (!ImGui::Begin("ImGui Demo", p_open, window_flags)) + if (!ImGui::Begin("Dear ImGui Demo", p_open, window_flags)) { // Early out if the window is collapsed, as an optimization. ImGui::End(); @@ -2572,7 +2572,7 @@ static void ShowDemoWindowColumns() ImGui::NextColumn(); if (open1) { - for (int y = 0; y < 5; y++) + for (int y = 0; y < 3; y++) { bool open2 = ImGui::TreeNode((void*)(intptr_t)y, "Node%d.%d", x, y); ImGui::NextColumn();