Push fileFilter callback function down a level.

(The GRID_CELL_PATH_EDITOR is shared by the whole column.)

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16707

Fixes https://gitlab.com/kicad/code/kicad/-/issues/13959

common/widgets/grid_text_button_helpers.cpp

@@ -366,17 +366,17 @@ class TEXT_BUTTON_FILE_BROWSER : public wxComboCtrl
 {
 public:
     TEXT_BUTTON_FILE_BROWSER( wxWindow* aParent, DIALOG_SHIM* aParentDlg, WX_GRID* aGrid,
-                              wxString* aCurrentDir, wxString* aExt = nullptr,
+                              wxString* aCurrentDir, const wxString& aFileFilter = wxEmptyString,
                               bool aNormalize = false,
-                              wxString aNormalizeBasePath = wxEmptyString ) :
+                              const wxString& aNormalizeBasePath = wxEmptyString ) :
             wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
                          wxTE_PROCESS_ENTER ),
             m_dlg( aParentDlg ),
             m_grid( aGrid ),
             m_currentDir( aCurrentDir ),
-            m_fileFilter( aExt ),
             m_normalize( aNormalize ),
-            m_normalizeBasePath( aNormalizeBasePath )
+            m_normalizeBasePath( aNormalizeBasePath ),
+            m_fileFilter( aFileFilter )
     {
         SetButtonBitmaps( KiBitmap( BITMAPS::small_folder ) );
 
@@ -384,11 +384,27 @@ public:
         Customize( wxCC_IFLAG_HAS_NONSTANDARD_BUTTON );
     }
 
-    void UpdateFileFilter( wxString* aFileFilter )
+    TEXT_BUTTON_FILE_BROWSER( wxWindow* aParent, DIALOG_SHIM* aParentDlg, WX_GRID* aGrid,
+                              wxString* aCurrentDir,
+                              std::function<wxString( WX_GRID* grid, int row )> aFileFilterFn,
+                              bool aNormalize = false,
+                              const wxString& aNormalizeBasePath = wxEmptyString ) :
+            wxComboCtrl( aParent, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize,
+                         wxTE_PROCESS_ENTER ),
+            m_dlg( aParentDlg ),
+            m_grid( aGrid ),
+            m_currentDir( aCurrentDir ),
+            m_normalize( aNormalize ),
+            m_normalizeBasePath( aNormalizeBasePath ),
+            m_fileFilterFn( std::move( aFileFilterFn ) )
     {
-        m_fileFilter = aFileFilter;
+        SetButtonBitmaps( KiBitmap( BITMAPS::small_folder ) );
+
+        // win32 fix, avoids drawing the "native dropdown caret"
+        Customize( wxCC_IFLAG_HAS_NONSTANDARD_BUTTON );
     }
 
+
 protected:
     void DoSetPopupControl( wxComboPopup* popup ) override
     {
@@ -397,6 +413,9 @@ protected:
 
     void OnButtonClick() override
     {
+        if( m_fileFilterFn )
+            m_fileFilter = m_fileFilterFn( m_grid, m_grid->GetGridCursorRow() );
+
         wxFileName fn = GetValue();
 
         if( fn.GetPath().IsEmpty() && m_currentDir )
@@ -404,10 +423,10 @@ protected:
         else
             fn.SetPath( ExpandEnvVarSubstitutions( fn.GetPath(), &m_dlg->Prj() ) );
 
-        if( m_fileFilter )
+        if( !m_fileFilter.IsEmpty() )
         {
             wxFileDialog dlg( m_dlg, _( "Select a File" ), fn.GetPath(), fn.GetFullName(),
-                              *m_fileFilter, wxFD_FILE_MUST_EXIST | wxFD_OPEN );
+                              m_fileFilter, wxFD_FILE_MUST_EXIST | wxFD_OPEN );
 
             if( dlg.ShowModal() == wxID_OK )
             {
@@ -469,9 +488,11 @@ protected:
     DIALOG_SHIM* m_dlg;
     WX_GRID*     m_grid;
     wxString*    m_currentDir;
-    wxString*    m_fileFilter;
     bool         m_normalize;
     wxString     m_normalizeBasePath;
+
+    wxString                                            m_fileFilter;
+    std::function<wxString( WX_GRID* aGrid, int aRow )> m_fileFilterFn;
 };
 
 
@@ -479,13 +500,10 @@ void GRID_CELL_PATH_EDITOR::Create( wxWindow* aParent, wxWindowID aId,
                                     wxEvtHandler* aEventHandler )
 {
     if( m_fileFilterFn )
-        m_fileFilter = m_fileFilterFn( m_grid, m_grid->GetGridCursorRow() );
+        m_control = new TEXT_BUTTON_FILE_BROWSER( aParent, m_dlg, m_grid, m_currentDir, m_fileFilterFn,
-
-    if( m_fileFilter.IsEmpty() )
-        m_control = new TEXT_BUTTON_FILE_BROWSER( aParent, m_dlg, m_grid, m_currentDir, nullptr,
                                                   m_normalize, m_normalizeBasePath );
     else
-        m_control = new TEXT_BUTTON_FILE_BROWSER( aParent, m_dlg, m_grid, m_currentDir, &m_fileFilter,
+        m_control = new TEXT_BUTTON_FILE_BROWSER( aParent, m_dlg, m_grid, m_currentDir, m_fileFilter,
                                                   m_normalize, m_normalizeBasePath );
 
 #if wxUSE_VALIDATORS
@@ -498,27 +516,3 @@ void GRID_CELL_PATH_EDITOR::Create( wxWindow* aParent, wxWindowID aId,
 
     wxGridCellEditor::Create( aParent, aId, aEventHandler );
 }
-
-
-void GRID_CELL_PATH_EDITOR::UpdateFilterString( const wxString& aFilterString )
-{
-    if( m_fileFilterFn )
-    {
-        int row = m_grid->GetGridCursorRow();
-
-        // When closing the window, the cursor position could be negative if no rows were selected,
-        // so don't try to update a filter for a non-existent row
-        if( row >= 0 )
-            m_fileFilter = m_fileFilterFn( m_grid, row );
-    }
-    else
-    {
-        m_fileFilter = aFilterString;
-    }
-
-    // Ensure that the control switches between files and directories properly
-    TEXT_BUTTON_FILE_BROWSER* button = dynamic_cast<TEXT_BUTTON_FILE_BROWSER*>( m_control );
-
-    if( button )
-        button->UpdateFileFilter( m_fileFilter.IsEmpty() ? nullptr : &m_fileFilter );
-}

eeschema/dialogs/panel_sym_lib_table.cpp

@@ -131,19 +131,6 @@ public:
 
             SetValue( aRow, COL_TYPE, SCH_IO_MGR::ShowType( pluginType ) );
         }
-        // If plugin type is changed, update the filter string in the chooser dialog
-        else if( aCol == COL_TYPE )
-        {
-            wxGridCellEditor* editor = GetView()->GetCellEditor( aRow, COL_URI );
-
-            if( editor )
-            {
-                if( GRID_CELL_PATH_EDITOR* pathEditor = dynamic_cast<GRID_CELL_PATH_EDITOR*>( editor ) )
-                    pathEditor->UpdateFilterString();
-
-                editor->DecRef();
-            }
-        }
     }
 
 

include/widgets/grid_text_button_helpers.h

@@ -200,15 +200,6 @@ public:
 
     void Create( wxWindow* aParent, wxWindowID aId, wxEvtHandler* aEventHandler ) override;
 
-    /**
-     * Update the filter string for the control's file chooser dialog. If a file filter function
-     * was provided on control creation, then that function is called to update the filter. Otherwise,
-     * the value of aFilterString is used.
-     *
-     * @param aFilterString is the new filter string to use when the control doesn't have a filter function.
-     */
-    void UpdateFilterString( const wxString& aFilterString = wxEmptyString );
-
 protected:
     DIALOG_SHIM* m_dlg;
     WX_GRID*     m_grid;

pcbnew/dialogs/panel_fp_lib_table.cpp

@@ -205,19 +205,6 @@ public:
 
             SetValue( aRow, COL_TYPE, PCB_IO_MGR::ShowType( pluginType ) );
         }
-        // If plugin type is changed, update the filter string in the chooser dialog
-        else if( aCol == COL_TYPE )
-        {
-            wxGridCellEditor* editor = GetView()->GetCellEditor( aRow, COL_URI );
-
-            if( editor )
-            {
-                if( GRID_CELL_PATH_EDITOR* pathEditor = dynamic_cast<GRID_CELL_PATH_EDITOR*>( editor ) )
-                    pathEditor->UpdateFilterString();
-
-                editor->DecRef();
-            }
-        }
     }
 };