Move node editor context menus to main imgui context to avoid scaling

Auburn · Dec 26, 2024 · d25e043 · d25e043
1 parent 6792ff9
commit d25e043
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 8 deletions.
diff --git a/tools/NodeEditor/FastNoiseNodeEditor.cpp b/tools/NodeEditor/FastNoiseNodeEditor.cpp
@@ -199,8 +199,6 @@ void FastNoiseNodeEditor::Node::GeneratePreview( bool nodeTreeChanged, bool benc
         genRGB->SetSource( scale );
         scale->SetSource( generator );
         scale->SetScaling( editor.mNodeScale );
-
-        FastNoise::SmartNode<FastNoise::ConvertRGBA8> l(nullptr);
 
         auto startTime = std::chrono::high_resolution_clock::now();
 
@@ -335,7 +333,7 @@ bool FastNoiseNodeEditor::MetadataMenuItem::CanDraw( std::function<bool( const F
 
 const FastNoise::Metadata* FastNoiseNodeEditor::MetadataMenuItem::DrawUI( std::function<bool( const FastNoise::Metadata* )> isValid, bool drawGroups ) const
 {
-    std::string format = FastNoise::Metadata::FormatMetadataNodeName( metadata, true );
+    std::string format = FastNoise::Metadata::FormatMetadataNodeName( metadata, drawGroups );
 
     if( ImGui::MenuItem( format.c_str() ) )
     {
@@ -589,6 +587,7 @@ void FastNoiseNodeEditor::SetupSettingsHandlers()
 
 FastNoiseNodeEditor::FastNoiseNodeEditor( NodeEditorApp& nodeEditorApp ) :
     mNodeEditorApp( nodeEditorApp ),
+    mMainContext( ImGui::GetCurrentContext() ),
     mOverheadNode( *this, new FastNoise::NodeData( &FastNoise::Metadata::Get<FastNoise::Constant>() ), false )
 {
     if( !mNodeEditorApp.IsDetachedNodeGraph() )
@@ -830,9 +829,10 @@ void FastNoiseNodeEditor::Draw( const Matrix4& transformation, const Matrix4& pr
             OpenStandaloneNodeGraph();
         }
 
+        ImGui::SetCurrentContext( mMainContext );
         DoHelp();
-
         DoContextMenu();
+        ImGui::SetCurrentContext( ImNodes::GetNodeEditorImGuiContext() );
 
         DoNodes();
 
@@ -1049,9 +1049,17 @@ void FastNoiseNodeEditor::DoNodes()
 
         ImNodes::EndNodeTitleBar();
 
+        if( ImGui::IsMouseReleased( ImGuiMouseButton_Right ) && ImGui::IsItemHovered( ImGuiHoveredFlags_AllowWhenBlockedByPopup ) )
+        {
+            ImGui::SetCurrentContext( mMainContext );
+            ImGui::OpenPopup( "node_title" );
+        }
+
+        ImGui::SetCurrentContext( mMainContext );
         // Right click node title to change node type
         ImGui::PushStyleVar( ImGuiStyleVar_WindowPadding, ImVec2( 4, 4 ) );
-        if( ImGui::BeginPopupContextItem() )
+
+        if( ImGui::BeginPopup( "node_title" ) )
         {
             if( ImGui::MenuItem( "Copy Encoded Node Tree" ) )
             {
@@ -1074,7 +1082,7 @@ void FastNoiseNodeEditor::DoNodes()
                     MatchingMembers( newMetadata->memberNodeLookups, nodeMetadata->memberNodeLookups ) &&
                     MatchingMembers( newMetadata->memberHybrids, nodeMetadata->memberHybrids ) )
                 {
-                    nodeMetadata = newMetadata;                    
+                    nodeMetadata = newMetadata;
                 }
                 else
                 {
@@ -1104,7 +1112,7 @@ void FastNoiseNodeEditor::DoNodes()
                         links.pop();
                     }
 
-                    *node.second.data = std::move( newData );                  
+                    *node.second.data = std::move( newData );
                 }
 
                 node.second.GeneratePreview();
@@ -1114,6 +1122,8 @@ void FastNoiseNodeEditor::DoNodes()
         }
         ImGui::PopStyleVar();
 
+        ImGui::SetCurrentContext( ImNodes::GetNodeEditorImGuiContext() );
+
         ImGui::PushItemWidth( 90.0f );
 
         ImNodes::PushAttributeFlag( ImNodesAttributeFlags_EnableLinkCreationOnSnap );
@@ -1286,7 +1296,7 @@ void FastNoiseNodeEditor::DoHelp()
     ImGui::Text( " Help" );
     if( ImGui::IsItemHovered() )
     {
-        ImGui::PushStyleVar( ImGuiStyleVar_WindowPadding, ImVec2( 4.f, 4.f ) );
+        ImGui::PushStyleVar( ImGuiStyleVar_WindowPadding, ImVec2( 6.f, 6.f ) );
         ImGui::BeginTooltip();
         constexpr float alignPx = 110;
 

diff --git a/tools/NodeEditor/FastNoiseNodeEditor.h b/tools/NodeEditor/FastNoiseNodeEditor.h
@@ -126,6 +126,7 @@ namespace Magnum
         void UpdateSelected();
 
         NodeEditorApp& mNodeEditorApp;
+        ImGuiContext* mMainContext;
 
         std::unordered_map<FastNoise::NodeData*, Node> mNodes;
         FastNoise::NodeData* mDroppedLinkNode = nullptr;