Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions imgui_extra_math.inl
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ inline bool operator!=(const ImVec2& lhs, const ImVec2& rhs)
return lhs.x != rhs.x || lhs.y != rhs.y;
}
# endif

# if IMGUI_VERSION_NUM < 19268
inline ImVec2 operator*(const float lhs, const ImVec2& rhs)
{
return ImVec2(lhs * rhs.x, lhs * rhs.y);
}

#endif
# if IMGUI_VERSION_NUM < 18955
inline ImVec2 operator-(const ImVec2& lhs)
{
Expand Down
21 changes: 21 additions & 0 deletions imgui_node_editor.cpp
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