From 5a7e98c7cf493fc88f7850bdc89c6ac75fa88ed6 Mon Sep 17 00:00:00 2001 From: omar Date: Mon, 4 Jun 2018 14:44:19 +0200 Subject: [PATCH] Internals: Nav: Removed ParentID from move result (unused, would need to be full-filled for PageUp/PageDown code) + FAQ typo fix. --- imgui.cpp | 3 +-- imgui_internal.h | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 07f0b183..f227fbd3 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -503,7 +503,7 @@ // Turn the RGBA pixel data into an OpenGL texture: GLuint my_opengl_texture; glGenTextures(1, &my_opengl_texture); - glBindTexture(GL_TEXTURE_2D, image_tex); + glBindTexture(GL_TEXTURE_2D, my_opengl_texture); glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image_width, image_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, image_data); @@ -2541,7 +2541,6 @@ static void ImGui::NavProcessItem(ImGuiWindow* window, const ImRect& nav_bb, con if (new_best) { result->ID = id; - result->ParentID = window->IDStack.back(); result->Window = window; result->RectRel = nav_bb_rel; } diff --git a/imgui_internal.h b/imgui_internal.h index 5c441706..9c61c814 100644 --- a/imgui_internal.h +++ b/imgui_internal.h @@ -538,7 +538,6 @@ struct ImDrawDataBuilder struct ImGuiNavMoveResult { ImGuiID ID; // Best candidate - ImGuiID ParentID; // Best candidate window->IDStack.back() - to compare context ImGuiWindow* Window; // Best candidate window float DistBox; // Best candidate box distance to current NavId float DistCenter; // Best candidate center distance to current NavId @@ -546,7 +545,7 @@ struct ImGuiNavMoveResult ImRect RectRel; // Best candidate bounding box in window relative space ImGuiNavMoveResult() { Clear(); } - void Clear() { ID = ParentID = 0; Window = NULL; DistBox = DistCenter = DistAxial = FLT_MAX; RectRel = ImRect(); } + void Clear() { ID = 0; Window = NULL; DistBox = DistCenter = DistAxial = FLT_MAX; RectRel = ImRect(); } }; // Storage for SetNexWindow** functions