mirror of
				https://github.com/Drezil/imgui.git
				synced 2025-10-31 05:01:05 +01:00 
			
		
		
		
	Member variable name renamed "ID" "Id" for casing consistency
This commit is contained in:
		
							
								
								
									
										46
									
								
								imgui.cpp
									
									
									
									
									
								
							
							
						
						
									
										46
									
								
								imgui.cpp
									
									
									
									
									
								
							| @@ -1695,7 +1695,7 @@ ImGuiWindow::ImGuiWindow(const char* name) | |||||||
|     Name = ImStrdup(name); |     Name = ImStrdup(name); | ||||||
|     ID = ImHash(name, 0); |     ID = ImHash(name, 0); | ||||||
|     IDStack.push_back(ID); |     IDStack.push_back(ID); | ||||||
|     MoveID = GetID("#MOVE"); |     MoveId = GetID("#MOVE"); | ||||||
|  |  | ||||||
|     Flags = 0; |     Flags = 0; | ||||||
|     IndexWithinParent = 0; |     IndexWithinParent = 0; | ||||||
| @@ -1714,7 +1714,7 @@ ImGuiWindow::ImGuiWindow(const char* name) | |||||||
|     Collapsed = false; |     Collapsed = false; | ||||||
|     SkipItems = false; |     SkipItems = false; | ||||||
|     BeginCount = 0; |     BeginCount = 0; | ||||||
|     PopupID = 0; |     PopupId = 0; | ||||||
|     AutoFitFramesX = AutoFitFramesY = -1; |     AutoFitFramesX = AutoFitFramesY = -1; | ||||||
|     AutoFitOnlyGrows = false; |     AutoFitOnlyGrows = false; | ||||||
|     AutoPosLastDirection = -1; |     AutoPosLastDirection = -1; | ||||||
| @@ -1839,7 +1839,7 @@ void ImGui::ItemSize(const ImRect& bb, float text_offset_y) | |||||||
| bool ImGui::ItemAdd(const ImRect& bb, const ImGuiID* id) | bool ImGui::ItemAdd(const ImRect& bb, const ImGuiID* id) | ||||||
| { | { | ||||||
|     ImGuiWindow* window = GetCurrentWindow(); |     ImGuiWindow* window = GetCurrentWindow(); | ||||||
|     window->DC.LastItemID = id ? *id : 0; |     window->DC.LastItemId = id ? *id : 0; | ||||||
|     window->DC.LastItemRect = bb; |     window->DC.LastItemRect = bb; | ||||||
|     window->DC.LastItemHoveredAndUsable = window->DC.LastItemHoveredRect = false; |     window->DC.LastItemHoveredAndUsable = window->DC.LastItemHoveredRect = false; | ||||||
|     if (IsClippedEx(bb, id, false)) |     if (IsClippedEx(bb, id, false)) | ||||||
| @@ -1853,7 +1853,7 @@ bool ImGui::ItemAdd(const ImRect& bb, const ImGuiID* id) | |||||||
|         // So that clicking on items with no active id such as Text() still returns true with IsItemHovered() |         // So that clicking on items with no active id such as Text() still returns true with IsItemHovered() | ||||||
|         window->DC.LastItemHoveredRect = true; |         window->DC.LastItemHoveredRect = true; | ||||||
|         if (g.HoveredRootWindow == window->RootWindow) |         if (g.HoveredRootWindow == window->RootWindow) | ||||||
|             if (g.ActiveId == 0 || (id && g.ActiveId == *id) || g.ActiveIdAllowOverlap || (g.ActiveId == window->MoveID)) |             if (g.ActiveId == 0 || (id && g.ActiveId == *id) || g.ActiveIdAllowOverlap || (g.ActiveId == window->MoveId)) | ||||||
|                 if (IsWindowContentHoverable(window)) |                 if (IsWindowContentHoverable(window)) | ||||||
|                     window->DC.LastItemHoveredAndUsable = true; |                     window->DC.LastItemHoveredAndUsable = true; | ||||||
|     } |     } | ||||||
| @@ -2132,7 +2132,7 @@ void ImGui::NewFrame() | |||||||
|     { |     { | ||||||
|         KeepAliveID(g.MovedWindowMoveId); |         KeepAliveID(g.MovedWindowMoveId); | ||||||
|         IM_ASSERT(g.MovedWindow && g.MovedWindow->RootWindow); |         IM_ASSERT(g.MovedWindow && g.MovedWindow->RootWindow); | ||||||
|         IM_ASSERT(g.MovedWindow->RootWindow->MoveID == g.MovedWindowMoveId); |         IM_ASSERT(g.MovedWindow->RootWindow->MoveId == g.MovedWindowMoveId); | ||||||
|         if (g.IO.MouseDown[0]) |         if (g.IO.MouseDown[0]) | ||||||
|         { |         { | ||||||
|             if (!(g.MovedWindow->Flags & ImGuiWindowFlags_NoMove)) |             if (!(g.MovedWindow->Flags & ImGuiWindowFlags_NoMove)) | ||||||
| @@ -2337,7 +2337,7 @@ static ImGuiIniData* FindWindowSettings(const char* name) | |||||||
|     for (int i = 0; i != g.Settings.Size; i++) |     for (int i = 0; i != g.Settings.Size; i++) | ||||||
|     { |     { | ||||||
|         ImGuiIniData* ini = &g.Settings[i]; |         ImGuiIniData* ini = &g.Settings[i]; | ||||||
|         if (ini->ID == id) |         if (ini->Id == id) | ||||||
|             return ini; |             return ini; | ||||||
|     } |     } | ||||||
|     return NULL; |     return NULL; | ||||||
| @@ -2348,7 +2348,7 @@ static ImGuiIniData* AddWindowSettings(const char* name) | |||||||
|     GImGui->Settings.resize(GImGui->Settings.Size + 1); |     GImGui->Settings.resize(GImGui->Settings.Size + 1); | ||||||
|     ImGuiIniData* ini = &GImGui->Settings.back(); |     ImGuiIniData* ini = &GImGui->Settings.back(); | ||||||
|     ini->Name = ImStrdup(name); |     ini->Name = ImStrdup(name); | ||||||
|     ini->ID = ImHash(name, 0); |     ini->Id = ImHash(name, 0); | ||||||
|     ini->Collapsed = false; |     ini->Collapsed = false; | ||||||
|     ini->Pos = ImVec2(FLT_MAX,FLT_MAX); |     ini->Pos = ImVec2(FLT_MAX,FLT_MAX); | ||||||
|     ini->Size = ImVec2(0,0); |     ini->Size = ImVec2(0,0); | ||||||
| @@ -2579,7 +2579,7 @@ void ImGui::EndFrame() | |||||||
|                 if (!(g.HoveredWindow->Flags & ImGuiWindowFlags_NoMove)) |                 if (!(g.HoveredWindow->Flags & ImGuiWindowFlags_NoMove)) | ||||||
|                 { |                 { | ||||||
|                     g.MovedWindow = g.HoveredWindow; |                     g.MovedWindow = g.HoveredWindow; | ||||||
|                     g.MovedWindowMoveId = g.HoveredRootWindow->MoveID; |                     g.MovedWindowMoveId = g.HoveredRootWindow->MoveId; | ||||||
|                     SetActiveID(g.MovedWindowMoveId, g.HoveredRootWindow); |                     SetActiveID(g.MovedWindowMoveId, g.HoveredRootWindow); | ||||||
|                 } |                 } | ||||||
|             } |             } | ||||||
| @@ -3211,7 +3211,7 @@ bool ImGui::IsItemActive() | |||||||
|     if (g.ActiveId) |     if (g.ActiveId) | ||||||
|     { |     { | ||||||
|         ImGuiWindow* window = GetCurrentWindowRead(); |         ImGuiWindow* window = GetCurrentWindowRead(); | ||||||
|         return g.ActiveId == window->DC.LastItemID; |         return g.ActiveId == window->DC.LastItemId; | ||||||
|     } |     } | ||||||
|     return false; |     return false; | ||||||
| } | } | ||||||
| @@ -3242,9 +3242,9 @@ bool ImGui::IsItemVisible() | |||||||
| void ImGui::SetItemAllowOverlap() | void ImGui::SetItemAllowOverlap() | ||||||
| { | { | ||||||
|     ImGuiContext& g = *GImGui; |     ImGuiContext& g = *GImGui; | ||||||
|     if (g.HoveredId == g.CurrentWindow->DC.LastItemID) |     if (g.HoveredId == g.CurrentWindow->DC.LastItemId) | ||||||
|         g.HoveredIdAllowOverlap = true; |         g.HoveredIdAllowOverlap = true; | ||||||
|     if (g.ActiveId == g.CurrentWindow->DC.LastItemID) |     if (g.ActiveId == g.CurrentWindow->DC.LastItemId) | ||||||
|         g.ActiveIdAllowOverlap = true; |         g.ActiveIdAllowOverlap = true; | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -3312,7 +3312,7 @@ void ImGui::EndTooltip() | |||||||
| static bool IsPopupOpen(ImGuiID id) | static bool IsPopupOpen(ImGuiID id) | ||||||
| { | { | ||||||
|     ImGuiContext& g = *GImGui; |     ImGuiContext& g = *GImGui; | ||||||
|     const bool is_open = g.OpenPopupStack.Size > g.CurrentPopupStack.Size && g.OpenPopupStack[g.CurrentPopupStack.Size].PopupID == id; |     const bool is_open = g.OpenPopupStack.Size > g.CurrentPopupStack.Size && g.OpenPopupStack[g.CurrentPopupStack.Size].PopupId == id; | ||||||
|     return is_open; |     return is_open; | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -3329,7 +3329,7 @@ void ImGui::OpenPopupEx(const char* str_id, bool reopen_existing) | |||||||
|     ImGuiPopupRef popup_ref = ImGuiPopupRef(id, window, window->GetID("##menus"), g.IO.MousePos); // Tagged as new ref because constructor sets Window to NULL (we are passing the ParentWindow info here) |     ImGuiPopupRef popup_ref = ImGuiPopupRef(id, window, window->GetID("##menus"), g.IO.MousePos); // Tagged as new ref because constructor sets Window to NULL (we are passing the ParentWindow info here) | ||||||
|     if (g.OpenPopupStack.Size < current_stack_size + 1) |     if (g.OpenPopupStack.Size < current_stack_size + 1) | ||||||
|         g.OpenPopupStack.push_back(popup_ref); |         g.OpenPopupStack.push_back(popup_ref); | ||||||
|     else if (reopen_existing || g.OpenPopupStack[current_stack_size].PopupID != id) |     else if (reopen_existing || g.OpenPopupStack[current_stack_size].PopupId != id) | ||||||
|     { |     { | ||||||
|         g.OpenPopupStack.resize(current_stack_size+1); |         g.OpenPopupStack.resize(current_stack_size+1); | ||||||
|         g.OpenPopupStack[current_stack_size] = popup_ref; |         g.OpenPopupStack[current_stack_size] = popup_ref; | ||||||
| @@ -3405,7 +3405,7 @@ void ImGui::CloseCurrentPopup() | |||||||
| { | { | ||||||
|     ImGuiContext& g = *GImGui; |     ImGuiContext& g = *GImGui; | ||||||
|     int popup_idx = g.CurrentPopupStack.Size - 1; |     int popup_idx = g.CurrentPopupStack.Size - 1; | ||||||
|     if (popup_idx < 0 || popup_idx > g.OpenPopupStack.Size || g.CurrentPopupStack[popup_idx].PopupID != g.OpenPopupStack[popup_idx].PopupID) |     if (popup_idx < 0 || popup_idx > g.OpenPopupStack.Size || g.CurrentPopupStack[popup_idx].PopupId != g.OpenPopupStack[popup_idx].PopupId) | ||||||
|         return; |         return; | ||||||
|     while (popup_idx > 0 && g.OpenPopupStack[popup_idx].Window && (g.OpenPopupStack[popup_idx].Window->Flags & ImGuiWindowFlags_ChildMenu)) |     while (popup_idx > 0 && g.OpenPopupStack[popup_idx].Window && (g.OpenPopupStack[popup_idx].Window->Flags & ImGuiWindowFlags_ChildMenu)) | ||||||
|         popup_idx--; |         popup_idx--; | ||||||
| @@ -3808,11 +3808,11 @@ bool ImGui::Begin(const char* name, bool* p_open, const ImVec2& size_on_first_us | |||||||
|     if (flags & ImGuiWindowFlags_Popup) |     if (flags & ImGuiWindowFlags_Popup) | ||||||
|     { |     { | ||||||
|         ImGuiPopupRef& popup_ref = g.OpenPopupStack[g.CurrentPopupStack.Size]; |         ImGuiPopupRef& popup_ref = g.OpenPopupStack[g.CurrentPopupStack.Size]; | ||||||
|         window_was_active &= (window->PopupID == popup_ref.PopupID); |         window_was_active &= (window->PopupId == popup_ref.PopupId); | ||||||
|         window_was_active &= (window == popup_ref.Window); |         window_was_active &= (window == popup_ref.Window); | ||||||
|         popup_ref.Window = window; |         popup_ref.Window = window; | ||||||
|         g.CurrentPopupStack.push_back(popup_ref); |         g.CurrentPopupStack.push_back(popup_ref); | ||||||
|         window->PopupID = popup_ref.PopupID; |         window->PopupId = popup_ref.PopupId; | ||||||
|     } |     } | ||||||
|  |  | ||||||
|     const bool window_appearing_after_being_hidden = (window->HiddenFrames == 1); |     const bool window_appearing_after_being_hidden = (window->HiddenFrames == 1); | ||||||
| @@ -9221,7 +9221,7 @@ static float GetDraggedColumnOffset(int column_index) | |||||||
|     ImGuiContext& g = *GImGui; |     ImGuiContext& g = *GImGui; | ||||||
|     ImGuiWindow* window = ImGui::GetCurrentWindowRead(); |     ImGuiWindow* window = ImGui::GetCurrentWindowRead(); | ||||||
|     IM_ASSERT(column_index > 0); // We cannot drag column 0. If you get this assert you may have a conflict between the ID of your columns and another widgets. |     IM_ASSERT(column_index > 0); // We cannot drag column 0. If you get this assert you may have a conflict between the ID of your columns and another widgets. | ||||||
|     IM_ASSERT(g.ActiveId == window->DC.ColumnsSetID + ImGuiID(column_index)); |     IM_ASSERT(g.ActiveId == window->DC.ColumnsSetId + ImGuiID(column_index)); | ||||||
|  |  | ||||||
|     float x = g.IO.MousePos.x - g.ActiveIdClickOffset.x - window->Pos.x; |     float x = g.IO.MousePos.x - g.ActiveIdClickOffset.x - window->Pos.x; | ||||||
|     x = ImClamp(x, ImGui::GetColumnOffset(column_index-1)+g.Style.ColumnsMinSpacing, ImGui::GetColumnOffset(column_index+1)-g.Style.ColumnsMinSpacing); |     x = ImClamp(x, ImGui::GetColumnOffset(column_index-1)+g.Style.ColumnsMinSpacing, ImGui::GetColumnOffset(column_index+1)-g.Style.ColumnsMinSpacing); | ||||||
| @@ -9238,7 +9238,7 @@ float ImGui::GetColumnOffset(int column_index) | |||||||
|  |  | ||||||
|     if (g.ActiveId) |     if (g.ActiveId) | ||||||
|     { |     { | ||||||
|         const ImGuiID column_id = window->DC.ColumnsSetID + ImGuiID(column_index); |         const ImGuiID column_id = window->DC.ColumnsSetId + ImGuiID(column_index); | ||||||
|         if (g.ActiveId == column_id) |         if (g.ActiveId == column_id) | ||||||
|             return GetDraggedColumnOffset(column_index); |             return GetDraggedColumnOffset(column_index); | ||||||
|     } |     } | ||||||
| @@ -9259,7 +9259,7 @@ void ImGui::SetColumnOffset(int column_index, float offset) | |||||||
|     const float t = (offset - window->DC.ColumnsMinX) / (window->DC.ColumnsMaxX - window->DC.ColumnsMinX); |     const float t = (offset - window->DC.ColumnsMinX) / (window->DC.ColumnsMaxX - window->DC.ColumnsMinX); | ||||||
|     window->DC.ColumnsData[column_index].OffsetNorm = t; |     window->DC.ColumnsData[column_index].OffsetNorm = t; | ||||||
|  |  | ||||||
|     const ImGuiID column_id = window->DC.ColumnsSetID + ImGuiID(column_index); |     const ImGuiID column_id = window->DC.ColumnsSetId + ImGuiID(column_index); | ||||||
|     window->DC.StateStorage->SetFloat(column_id, t); |     window->DC.StateStorage->SetFloat(column_id, t); | ||||||
| } | } | ||||||
|  |  | ||||||
| @@ -9310,7 +9310,7 @@ void ImGui::Columns(int columns_count, const char* id, bool border) | |||||||
|         for (int i = 1; i < window->DC.ColumnsCount; i++) |         for (int i = 1; i < window->DC.ColumnsCount; i++) | ||||||
|         { |         { | ||||||
|             float x = window->Pos.x + GetColumnOffset(i); |             float x = window->Pos.x + GetColumnOffset(i); | ||||||
|             const ImGuiID column_id = window->DC.ColumnsSetID + ImGuiID(i); |             const ImGuiID column_id = window->DC.ColumnsSetId + ImGuiID(i); | ||||||
|             const ImRect column_rect(ImVec2(x-4,y1),ImVec2(x+4,y2)); |             const ImRect column_rect(ImVec2(x-4,y1),ImVec2(x+4,y2)); | ||||||
|             if (IsClippedEx(column_rect, &column_id, false)) |             if (IsClippedEx(column_rect, &column_id, false)) | ||||||
|                 continue; |                 continue; | ||||||
| @@ -9338,7 +9338,7 @@ void ImGui::Columns(int columns_count, const char* id, bool border) | |||||||
|     // Differentiate column ID with an arbitrary prefix for cases where users name their columns set the same as another widget. |     // Differentiate column ID with an arbitrary prefix for cases where users name their columns set the same as another widget. | ||||||
|     // In addition, when an identifier isn't explicitly provided we include the number of columns in the hash to make it uniquer. |     // In addition, when an identifier isn't explicitly provided we include the number of columns in the hash to make it uniquer. | ||||||
|     PushID(0x11223347 + (id ? 0 : columns_count)); |     PushID(0x11223347 + (id ? 0 : columns_count)); | ||||||
|     window->DC.ColumnsSetID = window->GetID(id ? id : "columns"); |     window->DC.ColumnsSetId = window->GetID(id ? id : "columns"); | ||||||
|     PopID(); |     PopID(); | ||||||
|  |  | ||||||
|     // Set state for first column |     // Set state for first column | ||||||
| @@ -9360,7 +9360,7 @@ void ImGui::Columns(int columns_count, const char* id, bool border) | |||||||
|         window->DC.ColumnsData.resize(columns_count + 1); |         window->DC.ColumnsData.resize(columns_count + 1); | ||||||
|         for (int column_index = 0; column_index < columns_count + 1; column_index++) |         for (int column_index = 0; column_index < columns_count + 1; column_index++) | ||||||
|         { |         { | ||||||
|             const ImGuiID column_id = window->DC.ColumnsSetID + ImGuiID(column_index); |             const ImGuiID column_id = window->DC.ColumnsSetId + ImGuiID(column_index); | ||||||
|             KeepAliveID(column_id); |             KeepAliveID(column_id); | ||||||
|             const float default_t = column_index / (float)window->DC.ColumnsCount; |             const float default_t = column_index / (float)window->DC.ColumnsCount; | ||||||
|             const float t = window->DC.StateStorage->GetFloat(column_id, default_t);      // Cheaply store our floating point value inside the integer (could store an union into the map?) |             const float t = window->DC.StateStorage->GetFloat(column_id, default_t);      // Cheaply store our floating point value inside the integer (could store an union into the map?) | ||||||
| @@ -9696,7 +9696,7 @@ void ImGui::ShowMetricsWindow(bool* p_open) | |||||||
|             for (int i = 0; i < g.OpenPopupStack.Size; i++) |             for (int i = 0; i < g.OpenPopupStack.Size; i++) | ||||||
|             { |             { | ||||||
|                 ImGuiWindow* window = g.OpenPopupStack[i].Window; |                 ImGuiWindow* window = g.OpenPopupStack[i].Window; | ||||||
|                 ImGui::BulletText("PopupID: %08x, Window: '%s'%s%s", g.OpenPopupStack[i].PopupID, window ? window->Name : "NULL", window && (window->Flags & ImGuiWindowFlags_ChildWindow) ? " ChildWindow" : "", window && (window->Flags & ImGuiWindowFlags_ChildMenu) ? " ChildMenu" : ""); |                 ImGui::BulletText("PopupID: %08x, Window: '%s'%s%s", g.OpenPopupStack[i].PopupId, window ? window->Name : "NULL", window && (window->Flags & ImGuiWindowFlags_ChildWindow) ? " ChildWindow" : "", window && (window->Flags & ImGuiWindowFlags_ChildMenu) ? " ChildMenu" : ""); | ||||||
|             } |             } | ||||||
|             ImGui::TreePop(); |             ImGui::TreePop(); | ||||||
|         } |         } | ||||||
|   | |||||||
| @@ -312,7 +312,7 @@ struct IMGUI_API ImGuiTextEditState | |||||||
| struct ImGuiIniData | struct ImGuiIniData | ||||||
| { | { | ||||||
|     char*       Name; |     char*       Name; | ||||||
|     ImGuiID     ID; |     ImGuiID     Id; | ||||||
|     ImVec2      Pos; |     ImVec2      Pos; | ||||||
|     ImVec2      Size; |     ImVec2      Size; | ||||||
|     bool        Collapsed; |     bool        Collapsed; | ||||||
| @@ -331,13 +331,13 @@ struct ImGuiMouseCursorData | |||||||
| // Storage for current popup stack | // Storage for current popup stack | ||||||
| struct ImGuiPopupRef | struct ImGuiPopupRef | ||||||
| { | { | ||||||
|     ImGuiID         PopupID;        // Set on OpenPopup() |     ImGuiID         PopupId;        // Set on OpenPopup() | ||||||
|     ImGuiWindow*    Window;         // Resolved on BeginPopup() - may stay unresolved if user never calls OpenPopup() |     ImGuiWindow*    Window;         // Resolved on BeginPopup() - may stay unresolved if user never calls OpenPopup() | ||||||
|     ImGuiWindow*    ParentWindow;   // Set on OpenPopup() |     ImGuiWindow*    ParentWindow;   // Set on OpenPopup() | ||||||
|     ImGuiID         ParentMenuSet;  // Set on OpenPopup() |     ImGuiID         ParentMenuSet;  // Set on OpenPopup() | ||||||
|     ImVec2          MousePosOnOpen; // Copy of mouse position at the time of opening popup |     ImVec2          MousePosOnOpen; // Copy of mouse position at the time of opening popup | ||||||
|  |  | ||||||
|     ImGuiPopupRef(ImGuiID id, ImGuiWindow* parent_window, ImGuiID parent_menu_set, const ImVec2& mouse_pos) { PopupID = id; Window = NULL; ParentWindow = parent_window; ParentMenuSet = parent_menu_set; MousePosOnOpen = mouse_pos; } |     ImGuiPopupRef(ImGuiID id, ImGuiWindow* parent_window, ImGuiID parent_menu_set, const ImVec2& mouse_pos) { PopupId = id; Window = NULL; ParentWindow = parent_window; ParentMenuSet = parent_menu_set; MousePosOnOpen = mouse_pos; } | ||||||
| }; | }; | ||||||
|  |  | ||||||
| // Main state for ImGui | // Main state for ImGui | ||||||
| @@ -522,7 +522,7 @@ struct IMGUI_API ImGuiDrawContext | |||||||
|     float                   PrevLineTextBaseOffset; |     float                   PrevLineTextBaseOffset; | ||||||
|     float                   LogLinePosY; |     float                   LogLinePosY; | ||||||
|     int                     TreeDepth; |     int                     TreeDepth; | ||||||
|     ImGuiID                 LastItemID; |     ImGuiID                 LastItemId; | ||||||
|     ImRect                  LastItemRect; |     ImRect                  LastItemRect; | ||||||
|     bool                    LastItemHoveredAndUsable;  // Item rectangle is hovered, and its window is currently interactable with (not blocked by a popup preventing access to the window) |     bool                    LastItemHoveredAndUsable;  // Item rectangle is hovered, and its window is currently interactable with (not blocked by a popup preventing access to the window) | ||||||
|     bool                    LastItemHoveredRect;       // Item rectangle is hovered, but its window may or not be currently interactable with (might be blocked by a popup preventing access to the window) |     bool                    LastItemHoveredRect;       // Item rectangle is hovered, but its window may or not be currently interactable with (might be blocked by a popup preventing access to the window) | ||||||
| @@ -555,7 +555,7 @@ struct IMGUI_API ImGuiDrawContext | |||||||
|     float                   ColumnsCellMinY; |     float                   ColumnsCellMinY; | ||||||
|     float                   ColumnsCellMaxY; |     float                   ColumnsCellMaxY; | ||||||
|     bool                    ColumnsShowBorders; |     bool                    ColumnsShowBorders; | ||||||
|     ImGuiID                 ColumnsSetID; |     ImGuiID                 ColumnsSetId; | ||||||
|     ImVector<ImGuiColumnData> ColumnsData; |     ImVector<ImGuiColumnData> ColumnsData; | ||||||
|  |  | ||||||
|     ImGuiDrawContext() |     ImGuiDrawContext() | ||||||
| @@ -565,7 +565,7 @@ struct IMGUI_API ImGuiDrawContext | |||||||
|         CurrentLineTextBaseOffset = PrevLineTextBaseOffset = 0.0f; |         CurrentLineTextBaseOffset = PrevLineTextBaseOffset = 0.0f; | ||||||
|         LogLinePosY = -1.0f; |         LogLinePosY = -1.0f; | ||||||
|         TreeDepth = 0; |         TreeDepth = 0; | ||||||
|         LastItemID = 0; |         LastItemId = 0; | ||||||
|         LastItemRect = ImRect(0.0f,0.0f,0.0f,0.0f); |         LastItemRect = ImRect(0.0f,0.0f,0.0f,0.0f); | ||||||
|         LastItemHoveredAndUsable = LastItemHoveredRect = false; |         LastItemHoveredAndUsable = LastItemHoveredRect = false; | ||||||
|         MenuBarAppending = false; |         MenuBarAppending = false; | ||||||
| @@ -587,7 +587,7 @@ struct IMGUI_API ImGuiDrawContext | |||||||
|         ColumnsStartPosY = 0.0f; |         ColumnsStartPosY = 0.0f; | ||||||
|         ColumnsCellMinY = ColumnsCellMaxY = 0.0f; |         ColumnsCellMinY = ColumnsCellMaxY = 0.0f; | ||||||
|         ColumnsShowBorders = true; |         ColumnsShowBorders = true; | ||||||
|         ColumnsSetID = 0; |         ColumnsSetId = 0; | ||||||
|     } |     } | ||||||
| }; | }; | ||||||
|  |  | ||||||
| @@ -606,7 +606,7 @@ struct IMGUI_API ImGuiWindow | |||||||
|     ImVec2                  SizeContentsExplicit;               // Size of contents explicitly set by the user via SetNextWindowContentSize() |     ImVec2                  SizeContentsExplicit;               // Size of contents explicitly set by the user via SetNextWindowContentSize() | ||||||
|     ImRect                  ContentsRegionRect;                 // Maximum visible content position in window coordinates. ~~ (SizeContentsExplicit ? SizeContentsExplicit : Size - ScrollbarSizes) - CursorStartPos, per axis |     ImRect                  ContentsRegionRect;                 // Maximum visible content position in window coordinates. ~~ (SizeContentsExplicit ? SizeContentsExplicit : Size - ScrollbarSizes) - CursorStartPos, per axis | ||||||
|     ImVec2                  WindowPadding;                      // Window padding at the time of begin. We need to lock it, in particular manipulation of the ShowBorder would have an effect |     ImVec2                  WindowPadding;                      // Window padding at the time of begin. We need to lock it, in particular manipulation of the ShowBorder would have an effect | ||||||
|     ImGuiID                 MoveID;                             // == window->GetID("#MOVE") |     ImGuiID                 MoveId;                             // == window->GetID("#MOVE") | ||||||
|     ImVec2                  Scroll; |     ImVec2                  Scroll; | ||||||
|     ImVec2                  ScrollTarget;                       // target scroll position. stored as cursor position with scrolling canceled out, so the highest point is always 0.0f. (FLT_MAX for no change) |     ImVec2                  ScrollTarget;                       // target scroll position. stored as cursor position with scrolling canceled out, so the highest point is always 0.0f. (FLT_MAX for no change) | ||||||
|     ImVec2                  ScrollTargetCenterRatio;            // 0.0f = scroll so that target position is at top, 0.5f = scroll so that target position is centered |     ImVec2                  ScrollTargetCenterRatio;            // 0.0f = scroll so that target position is at top, 0.5f = scroll so that target position is centered | ||||||
| @@ -619,7 +619,7 @@ struct IMGUI_API ImGuiWindow | |||||||
|     bool                    Collapsed;                          // Set when collapsing window to become only title-bar |     bool                    Collapsed;                          // Set when collapsing window to become only title-bar | ||||||
|     bool                    SkipItems;                          // == Visible && !Collapsed |     bool                    SkipItems;                          // == Visible && !Collapsed | ||||||
|     int                     BeginCount;                         // Number of Begin() during the current frame (generally 0 or 1, 1+ if appending via multiple Begin/End pairs) |     int                     BeginCount;                         // Number of Begin() during the current frame (generally 0 or 1, 1+ if appending via multiple Begin/End pairs) | ||||||
|     ImGuiID                 PopupID;                            // ID in the popup stack when this window is used as a popup/menu (because we use generic Name/ID for recycling) |     ImGuiID                 PopupId;                            // ID in the popup stack when this window is used as a popup/menu (because we use generic Name/ID for recycling) | ||||||
|     int                     AutoFitFramesX, AutoFitFramesY; |     int                     AutoFitFramesX, AutoFitFramesY; | ||||||
|     bool                    AutoFitOnlyGrows; |     bool                    AutoFitOnlyGrows; | ||||||
|     int                     AutoPosLastDirection; |     int                     AutoPosLastDirection; | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user