From 8691c5ca429764528154e4e0cfe1ceb46fe55c6e Mon Sep 17 00:00:00 2001 From: ocornut Date: Tue, 3 Mar 2015 15:52:56 +0000 Subject: [PATCH] Version number + commented failing test case --- imgui.cpp | 6 +++++- imgui.h | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 7652d7c8..e64884b6 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -1,4 +1,4 @@ -// ImGui library v1.34 +// ImGui library v1.35 wip // See ImGui::ShowTestWindow() for sample code. // Read 'Programmer guide' below for notes on how to setup ImGui in your codebase. // Get latest version at https://github.com/ocornut/imgui @@ -8751,6 +8751,10 @@ void ImGui::ShowTestWindow(bool* opened) const char* items[] = { "AAAA", "BBBB", "CCCC", "DDDD" }; static int item = -1; ImGui::Combo("Combo", &item, items, IM_ARRAYSIZE(items)); + //ImGui::SameLine(); + //ImGui::ListBox("Listbox", &item, items, IM_ARRAYSIZE(items)); + //if (ImGui::IsItemHovered()) + // ImGui::SetTooltip("Hovered"); ImGui::SameLine(); ImGui::SliderFloat("X", &f0, 0.0f,5.0f); ImGui::SameLine(); diff --git a/imgui.h b/imgui.h index dbb86aa5..edf80033 100644 --- a/imgui.h +++ b/imgui.h @@ -1,4 +1,4 @@ -// ImGui library v1.34 +// ImGui library v1.35 wip // See .cpp file for documentation. // See ImGui::ShowTestWindow() for sample code. // Read 'Programmer guide' in .cpp for notes on how to setup ImGui in your codebase.