Skip to content

Commit cc9c197

Browse files
committed
Editor: Support ImGui r18836 after SetItemUsingMouseWheel removal (#218), thanks @ocornut
# Conflicts: # docs/CHANGELOG.txt
1 parent f51c7ef commit cc9c197

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

docs/CHANGELOG.txt

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

33
NEW: Editor: Add offset of hover/select to style (thanks @MultiPain)
44

5+
CHANGE: Editor: Support ImGui r18836 after SetItemUsingMouseWheel removal (#218), thanks @ocornut
6+
57
CHANGE: Editor: Define IMGUI_DEFINE_MATH_OPERATORS before <imgui.h> (#209), thanks @ocornut
68

79
CHANGE: Examples: Define IMGUI_DEFINE_MATH_OPERATORS before <imgui.h> (#209), thanks @ocornut

imgui_node_editor.cpp

+4-1
Original file line numberDiff line numberDiff line change
@@ -2560,7 +2560,10 @@ ed::Control ed::EditorContext::BuildControl(bool allowOffscreen)
25602560
if (!allowOffscreen && !m_IsHovered)
25612561
return Control();
25622562

2563-
# if IMGUI_VERSION_NUM >= 17909
2563+
# if IMGUI_VERSION_NUM >= 18836
2564+
if (m_IsHoveredWithoutOverlapp)
2565+
ImGui::SetItemKeyOwner(ImGuiKey_MouseWheelY);
2566+
# elif IMGUI_VERSION_NUM >= 17909
25642567
if (m_IsHoveredWithoutOverlapp)
25652568
ImGui::SetItemUsingMouseWheel();
25662569
# endif

0 commit comments

Comments
 (0)