From d8452ad02ca4a34e1897ce8963eec06c9556b675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20M=C3=BCller?= Date: Sat, 11 Nov 2023 16:42:46 +0100 Subject: [PATCH] Extract `ShowPopupEnvPoint` local function --- src/game/editor/editor.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/game/editor/editor.cpp b/src/game/editor/editor.cpp index a7aa16629..a39b935a8 100644 --- a/src/game/editor/editor.cpp +++ b/src/game/editor/editor.cpp @@ -6269,6 +6269,11 @@ void CEditor::RenderEnvelopeEditor(CUIRect View) } { + static SPopupMenuId s_PopupEnvPointId; + const auto &&ShowPopupEnvPoint = [&]() { + UI()->DoPopupMenu(&s_PopupEnvPointId, UI()->MouseX(), UI()->MouseY(), 150, 56, this, PopupEnvPoint); + }; + if(s_Operation == OP_NONE) SetHotEnvelopePoint(View, pEnvelope, s_ActiveChannels); @@ -6412,8 +6417,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View) if(m_vSelectedEnvelopePoints.size() == 1) { m_UpdateEnvPointInfo = true; - static SPopupMenuId s_PopupEnvPointId; - UI()->DoPopupMenu(&s_PopupEnvPointId, UI()->MouseX(), UI()->MouseY(), 150, 56, this, PopupEnvPoint); + ShowPopupEnvPoint(); } else if(m_vSelectedEnvelopePoints.size() > 1) { @@ -6556,8 +6560,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View) if(IsTangentOutPointSelected(i, c)) { m_UpdateEnvPointInfo = true; - static SPopupMenuId s_PopupEnvPointId; - UI()->DoPopupMenu(&s_PopupEnvPointId, UI()->MouseX(), UI()->MouseY(), 150, 56, this, PopupEnvPoint); + ShowPopupEnvPoint(); } UI()->SetActiveItem(nullptr); } @@ -6689,8 +6692,7 @@ void CEditor::RenderEnvelopeEditor(CUIRect View) if(IsTangentInPointSelected(i, c)) { m_UpdateEnvPointInfo = true; - static SPopupMenuId s_PopupEnvPointId; - UI()->DoPopupMenu(&s_PopupEnvPointId, UI()->MouseX(), UI()->MouseY(), 150, 56, this, PopupEnvPoint); + ShowPopupEnvPoint(); } UI()->SetActiveItem(nullptr); }