Skip to content

Fix for ImGui 1.92.8: AddRect/PathStroke arg swap #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pthom wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix for ImGui 1.92.8: AddRect/PathStroke arg swap #339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions imgui_node_editor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,11 @@ static void ImDrawList_AddBezierWithArrows(ImDrawList* drawList, const ImCubicBe

ImDrawList_PathBezierOffset(drawList, half_thickness, curve.P3, curve.P2, curve.P1, curve.P0);

#if IMGUI_VERSION_NUM < 19276
drawList->PathStroke(color, true, strokeThickness);
#else
drawList->PathStroke(color, strokeThickness, ImDrawFlags_Closed);
#endif
}
}

Expand All @@ -584,8 +588,13 @@ void ed::Pin::Draw(ImDrawList* drawList, DrawFlags flags)
if (m_BorderWidth > 0.0f)
{
FringeScaleScope fringe(1.0f);
#if IMGUI_VERSION_NUM < 19276
drawList->AddRect(m_Bounds.Min, m_Bounds.Max,
m_BorderColor, m_Rounding, m_Corners, m_BorderWidth);
#else
drawList->AddRect(m_Bounds.Min, m_Bounds.Max,
m_BorderColor, m_Rounding, m_BorderWidth, m_Corners);
#endif
}

if (!Editor->IsSelected(m_Node))
Expand Down Expand Up @@ -683,10 +692,17 @@ void ed::Node::Draw(ImDrawList* drawList, DrawFlags flags)
{
FringeScaleScope fringe(1.0f);

#if IMGUI_VERSION_NUM < 19276
drawList->AddRect(
m_GroupBounds.Min,
m_GroupBounds.Max,
m_GroupBorderColor, m_GroupRounding, c_AllRoundCornersFlags, m_GroupBorderWidth);
#else
drawList->AddRect(
m_GroupBounds.Min,
m_GroupBounds.Max,
m_GroupBorderColor, m_GroupRounding, m_GroupBorderWidth, c_AllRoundCornersFlags);
#endif
}
}

Expand Down Expand Up @@ -738,8 +754,13 @@ void ed::Node::DrawBorder(ImDrawList* drawList, ImU32 color, float thickness, fl
{
const ImVec2 extraOffset = ImVec2(offset, offset);

#if IMGUI_VERSION_NUM < 19276
drawList->AddRect(m_Bounds.Min - extraOffset, m_Bounds.Max + extraOffset,
color, ImMax(0.0f, m_Rounding + offset), c_AllRoundCornersFlags, thickness);
#else
drawList->AddRect(m_Bounds.Min - extraOffset, m_Bounds.Max + extraOffset,
color, ImMax(0.0f, m_Rounding + offset), thickness, c_AllRoundCornersFlags);
#endif
}
}

Expand Down