From 7d28fe59156dc9fd8e1ee2dc6bbae0be4e7ef9bb Mon Sep 17 00:00:00 2001 From: ocornut Date: Wed, 27 May 2015 15:51:50 +0100 Subject: [PATCH] WIP Menus: Reverted f26de4635066950da80a174f276b668d4cb336a2 for now (#126) --- imgui.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index d595cf8f..a6101fb0 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -357,7 +357,8 @@ - combo/listbox: keyboard control. need inputtext like non-active focus + key handling. considering keybord for custom listbox (see github pr #203) - listbox: multiple selection - listbox: user may want to initial scroll to focus on the one selected value? - ! menubar, menus (github issue #126) + - menus: local shortcuts, global shortcuts + - menus: icons - tabs - gauge: various forms of gauge/loading bars widgets - color: better color editor. @@ -4926,8 +4927,8 @@ static bool ButtonEx(const char* label, const ImVec2& size_arg = ImVec2(0,0), Im RenderTextClipped(bb.Min, bb.Max, label, NULL, &label_size, NULL, ImGuiAlign_Center | ImGuiAlign_VCenter); // Automatically close popups - if (pressed && !(flags & ImGuiButtonFlags_DontClosePopups) && (window->Flags & ImGuiWindowFlags_Popup)) - ImGui::CloseCurrentPopup(); + //if (pressed && !(flags & ImGuiButtonFlags_DontClosePopups) && (window->Flags & ImGuiWindowFlags_Popup)) + // ImGui::CloseCurrentPopup(); return pressed; } @@ -11464,7 +11465,6 @@ static void ShowExampleMenuFile() static float f = 0.5f; ImGui::SliderFloat("Value", &f, 0.0f, 1.0f); ImGui::InputFloat("Input", &f, 0.1f); - ImGui::Button("Button"); ImGui::EndMenu(); } if (ImGui::BeginMenu("Colors"))