Skip to content

Commit b112b1e

Browse files
committed
Examples: Don't use deprecated SetItemAllowOverlap (#250)
1 parent db60e0d commit b112b1e

File tree

2 files changed

+15
-0
lines changed

2 files changed

+15
-0
lines changed

docs/CHANGELOG.txt

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ v0.9.2 (WIP):
1414

1515
CHANGE: Canvas: Don't use deprecated SetItemAllowOverlap (#250)
1616

17+
CHANGE: Examples: Don't use deprecated SetItemAllowOverlap (#250)
18+
1719
CHANGE: Editor: Define IMGUI_DEFINE_MATH_OPERATORS before <imgui.h> (#209), thanks @ocornut
1820

1921
CHANGE: Editor: Unary operator- for ImVec2 is defined by ImGui since r18955 (#248)

examples/blueprints-example/blueprints-example.cpp

+13
Original file line numberDiff line numberDiff line change
@@ -766,6 +766,9 @@ struct Example:
766766
}
767767

768768
bool isSelected = std::find(selectedNodes.begin(), selectedNodes.end(), node.ID) != selectedNodes.end();
769+
# if IMGUI_VERSION_NUM >= 18967
770+
ImGui::SetNextItemAllowOverlap();
771+
# endif
769772
if (ImGui::Selectable((node.Name + "##" + std::to_string(reinterpret_cast<uintptr_t>(node.ID.AsPointer()))).c_str(), &isSelected))
770773
{
771774
if (io.KeyCtrl)
@@ -794,7 +797,11 @@ struct Example:
794797

795798
auto drawList = ImGui::GetWindowDrawList();
796799
ImGui::SetCursorScreenPos(iconPanelPos);
800+
# if IMGUI_VERSION_NUM < 18967
797801
ImGui::SetItemAllowOverlap();
802+
# else
803+
ImGui::SetNextItemAllowOverlap();
804+
# endif
798805
if (node.SavedState.empty())
799806
{
800807
if (ImGui::InvisibleButton("save", ImVec2((float)saveIconWidth, (float)saveIconHeight)))
@@ -814,7 +821,11 @@ struct Example:
814821
}
815822

816823
ImGui::SameLine(0, ImGui::GetStyle().ItemInnerSpacing.x);
824+
# if IMGUI_VERSION_NUM < 18967
817825
ImGui::SetItemAllowOverlap();
826+
# else
827+
ImGui::SetNextItemAllowOverlap();
828+
# endif
818829
if (!node.SavedState.empty())
819830
{
820831
if (ImGui::InvisibleButton("restore", ImVec2((float)restoreIconWidth, (float)restoreIconHeight)))
@@ -838,7 +849,9 @@ struct Example:
838849
}
839850

840851
ImGui::SameLine(0, 0);
852+
# if IMGUI_VERSION_NUM < 18967
841853
ImGui::SetItemAllowOverlap();
854+
# endif
842855
ImGui::Dummy(ImVec2(0, (float)restoreIconHeight));
843856

844857
ImGui::PopID();

0 commit comments

Comments
 (0)