From 04764c922452207d8bf7366e67efdcd6057ab054 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Thu, 1 Jul 2021 21:03:14 +0100
Subject: [PATCH] Allow dragging of fields in symbol aliases.

Fixes https://gitlab.com/kicad/code/kicad/issues/8698
---
 eeschema/tools/ee_selection_tool.cpp | 33 +++++++++++++++-------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/eeschema/tools/ee_selection_tool.cpp b/eeschema/tools/ee_selection_tool.cpp
index 0be8139fd5..ca5831907b 100644
--- a/eeschema/tools/ee_selection_tool.cpp
+++ b/eeschema/tools/ee_selection_tool.cpp
@@ -315,6 +315,13 @@ const KICAD_T movableSymbolItems[] =
 };
 
 
+const KICAD_T movableSymbolAliasItems[] =
+{
+    LIB_FIELD_T,
+    EOT
+};
+
+
 void EE_SELECTION_TOOL::setModifiersState( bool aShiftState, bool aCtrlState, bool aAltState )
 {
     // Set the configuration of m_additive, m_subtractive, m_exclusive_or
@@ -552,30 +559,26 @@ int EE_SELECTION_TOOL::Main( const TOOL_EVENT& aEvent )
             }
             else
             {
-                // selection is empty? try to start dragging the item under the point where drag
-                // started
-                if( m_isSymbolEditor && m_selection.Empty() )
-                    m_selection = RequestSelection( movableSymbolItems );
-                else if( m_selection.Empty() )
+                if( m_isSymbolEditor )
+                {
+                    if( static_cast<SYMBOL_EDIT_FRAME*>( m_frame )->IsSymbolAlias() )
+                        m_selection = RequestSelection( movableSymbolAliasItems );
+                    else
+                        m_selection = RequestSelection( movableSymbolItems );
+                }
+                else
+                {
                     m_selection = RequestSelection( movableSchematicItems );
+                }
 
                 // Check if dragging has started within any of selected items bounding box
                 if( selectionContains( evt->Position() ) )
                 {
                     // Yes -> run the move tool and wait till it finishes
                     if( m_isSymbolEditor )
-                    {
-                        SYMBOL_EDIT_FRAME* libFrame = dynamic_cast<SYMBOL_EDIT_FRAME*>( m_frame );
-
-                        // Cannot move any derived symbol elements for now.
-                        if( libFrame && libFrame->GetCurSymbol()
-                          && libFrame->GetCurSymbol()->IsRoot() )
-                            m_toolMgr->InvokeTool( "eeschema.SymbolMoveTool" );
-                    }
+                        m_toolMgr->InvokeTool( "eeschema.SymbolMoveTool" );
                     else
-                    {
                         m_toolMgr->InvokeTool( "eeschema.InteractiveMove" );
-                    }
                 }
                 else
                 {