update for ImGui 1.83

aiekick · aiekick · commit a2c2ca2bdd25 · 2021-07-17T18:45:57.000+02:00
diff --git a/ImGuiFileDialog.cpp b/ImGuiFileDialog.cpp
@@ -576,10 +576,10 @@ namespace IGFD
 		bool item_add;
 		if (flags & ImGuiSelectableFlags_Disabled)
 		{
-			ImGuiItemFlags backup_item_flags = window->DC.ItemFlags;
-			window->DC.ItemFlags |= ImGuiItemFlags_Disabled | ImGuiItemFlags_NoNavDefaultFocus;
+			ImGuiItemFlags backup_item_flags = g.CurrentItemFlags;
+			g.CurrentItemFlags |= ImGuiItemFlags_Disabled | ImGuiItemFlags_NoNavDefaultFocus;
 			item_add = ItemAdd(bb, id);
-			window->DC.ItemFlags = backup_item_flags;
+			g.CurrentItemFlags = backup_item_flags;
 		}
 		else
 		{
@@ -657,10 +657,10 @@ namespace IGFD
 		if (flags & ImGuiSelectableFlags_Disabled) PopStyleColor();
 
 		// Automatically close popups
-		if (pressed && (window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiSelectableFlags_DontClosePopups) && !(window->DC.ItemFlags & ImGuiItemFlags_SelectableDontClosePopup))
+		if (pressed && (window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiSelectableFlags_DontClosePopups) && !(g.CurrentItemFlags & ImGuiItemFlags_SelectableDontClosePopup))
 			CloseCurrentPopup();
 
-		IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags);
+		IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.LastItemStatusFlags);
 		return pressed;
 	}
 #endif // USE_EXPLORATION_BY_KEYS

Original file line number	Diff line number	Diff line change
`@@ -576,10 +576,10 @@ namespace IGFD`
`576`	`576`	`bool item_add;`
`577`	`577`	`if (flags & ImGuiSelectableFlags_Disabled)`
`578`	`578`	`{`
`579`		`- ImGuiItemFlags backup_item_flags = window->DC.ItemFlags;`
`580`		`- window->DC.ItemFlags \|= ImGuiItemFlags_Disabled \| ImGuiItemFlags_NoNavDefaultFocus;`
	`579`	`+ ImGuiItemFlags backup_item_flags = g.CurrentItemFlags;`
	`580`	`+ g.CurrentItemFlags \|= ImGuiItemFlags_Disabled \| ImGuiItemFlags_NoNavDefaultFocus;`
`581`	`581`	`item_add = ItemAdd(bb, id);`
`582`		`- window->DC.ItemFlags = backup_item_flags;`
	`582`	`+ g.CurrentItemFlags = backup_item_flags;`
`583`	`583`	`}`
`584`	`584`	`else`
`585`	`585`	`{`
`@@ -657,10 +657,10 @@ namespace IGFD`
`657`	`657`	`if (flags & ImGuiSelectableFlags_Disabled) PopStyleColor();`
`658`	`658`
`659`	`659`	`// Automatically close popups`
`660`		`- if (pressed && (window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiSelectableFlags_DontClosePopups) && !(window->DC.ItemFlags & ImGuiItemFlags_SelectableDontClosePopup))`
	`660`	`+ if (pressed && (window->Flags & ImGuiWindowFlags_Popup) && !(flags & ImGuiSelectableFlags_DontClosePopups) && !(g.CurrentItemFlags & ImGuiItemFlags_SelectableDontClosePopup))`
`661`	`661`	`CloseCurrentPopup();`
`662`	`662`
`663`		`- IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.ItemFlags);`
	`663`	`+ IMGUI_TEST_ENGINE_ITEM_INFO(id, label, window->DC.LastItemStatusFlags);`
`664`	`664`	`return pressed;`
`665`	`665`	`}`
`666`	`666`	`#endif // USE_EXPLORATION_BY_KEYS`