Centralize/fix duplicated canvas type resolution between gerbview and pcbnew

common/eda_draw_frame.cpp

@@ -989,3 +989,53 @@ void EDA_DRAW_FRAME::GetUnitPair( EDA_UNITS& aPrimaryUnit, EDA_UNITS& aSecondary
             aSecondaryUnits = EDA_UNITS::MILS;
     }
 }
+
+
+void EDA_DRAW_FRAME::ResolveCanvasType()
+{
+    EDA_DRAW_PANEL_GAL::GAL_TYPE savedCanvasType = LoadCanvasTypeSetting();
+
+    // Nudge user to switch to OpenGL if they are on legacy or Cairo
+    if( m_firstRunDialogSetting < 1 )
+    {
+        if( savedCanvasType != EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL )
+        {
+            wxString msg =
+                    _( "KiCad can use your graphics card to give you a smoother "
+                       "and faster experience. This option is turned off by "
+                       "default since it is not compatible with all computers.\n\n"
+                       "Would you like to try enabling graphics acceleration?\n\n"
+                       "If you'd like to choose later, select Accelerated Graphics "
+                       "in the Preferences menu." );
+
+            wxMessageDialog dlg( this, msg, _( "Enable Graphics Acceleration" ), wxYES_NO );
+
+            dlg.SetYesNoLabels( _( "&Enable Acceleration" ), _( "&No Thanks" ) );
+
+            if( dlg.ShowModal() == wxID_YES )
+            {
+                // Save Cairo as default in case OpenGL crashes
+                saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO );
+
+                // Switch to OpenGL, which will save the new setting if successful
+                GetToolManager()->RunAction( ACTIONS::acceleratedGraphics, true );
+
+                // Switch back to Cairo if OpenGL is not supported
+                if( GetCanvas()->GetBackend() == EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE )
+                    GetToolManager()->RunAction( ACTIONS::standardGraphics, true );
+            }
+            else
+            {
+                // If they were on legacy, switch to Cairo
+                GetToolManager()->RunAction( ACTIONS::standardGraphics, true );
+            }
+        }
+
+        m_firstRunDialogSetting = 1;
+        SaveSettings( config() );
+    }
+    else
+    {
+        m_canvasType = savedCanvasType;
+    }
+}

gerbview/gerbview_frame.cpp

@@ -159,48 +159,9 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent )
     SetActiveLayer( 0, true );
     GetToolManager()->RunAction( ACTIONS::zoomFitScreen, false );
 
-    EDA_DRAW_PANEL_GAL::GAL_TYPE canvasType = LoadCanvasTypeSetting();
+    ResolveCanvasType();
 
-    // Nudge user to switch to OpenGL if they are on legacy or Cairo
+    SwitchCanvas( m_canvasType );
-    if( m_firstRunDialogSetting < 1 )
-    {
-        if( canvasType != EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL )
-        {
-            wxString msg = _( "KiCad can use your graphics card to give you a smoother "
-                              "and faster experience. This option is turned off by "
-                              "default since it is not compatible with all computers.\n\n"
-                              "Would you like to try enabling graphics acceleration?\n\n"
-                              "If you'd like to choose later, select Accelerated Graphics "
-                              "in the Preferences menu." );
-
-            wxMessageDialog dlg( this, msg, _( "Enable Graphics Acceleration" ), wxYES_NO );
-
-            dlg.SetYesNoLabels( _( "&Enable Acceleration" ), _( "&No Thanks" ) );
-
-            if( dlg.ShowModal() == wxID_YES )
-            {
-                // Save Cairo as default in case OpenGL crashes
-                saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO );
-
-                // Switch to OpenGL, which will save the new setting if successful
-                GetToolManager()->RunAction( ACTIONS::acceleratedGraphics, true );
-
-                // Switch back to Cairo if OpenGL is not supported
-                if( GetCanvas()->GetBackend() == EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE )
-                    GetToolManager()->RunAction( ACTIONS::standardGraphics, true );
-            }
-            else
-            {
-                // If they were on legacy, switch to Cairo
-                GetToolManager()->RunAction( ACTIONS::standardGraphics, true );
-            }
-        }
-
-        m_firstRunDialogSetting = 1;
-        SaveSettings( config() );
-    }
-
-    SwitchCanvas( canvasType );
 
     setupUnits( config() );
 

include/eda_draw_frame.h

@@ -120,6 +120,11 @@ protected:
 
     void CommonSettingsChanged( bool aEnvVarsChanged, bool aTextVarsChanged ) override;
 
+    /**
+     * Determines the Canvas type to load (with prompt if required) and initializes m_canvasType
+     */
+    void ResolveCanvasType();
+
     /**
      * Sets the common key-pair for exiting the application (Ctrl-Q) and ties it
      * to the wxID_EXIT event id.  This is useful in sub-applications to pass the event

pcbnew/pcb_edit_frame.cpp

@@ -304,46 +304,7 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
     // to calculate the wrong zoom size.  See PCB_EDIT_FRAME::onSize().
     Bind( wxEVT_SIZE, &PCB_EDIT_FRAME::onSize, this );
 
-    m_canvasType = LoadCanvasTypeSetting();
+    ResolveCanvasType();
-
-    // Nudge user to switch to OpenGL if they are on Cairo
-    if( m_firstRunDialogSetting < 1 )
-    {
-        if( m_canvasType != EDA_DRAW_PANEL_GAL::GAL_TYPE_OPENGL )
-        {
-            wxString msg = _( "KiCad can use your graphics card to give you a smoother "
-                              "and faster experience. This option is turned off by "
-                              "default since it is not compatible with all computers.\n\n"
-                              "Would you like to try enabling graphics acceleration?\n\n"
-                              "If you'd like to choose later, select Accelerated Graphics "
-                              "in the Preferences menu." );
-
-            wxMessageDialog dlg( this, msg, _( "Enable Graphics Acceleration" ), wxYES_NO );
-
-            dlg.SetYesNoLabels( _( "&Enable Acceleration" ), _( "&No Thanks" ) );
-
-            if( dlg.ShowModal() == wxID_YES )
-            {
-                // Save Cairo as default in case OpenGL crashes
-                saveCanvasTypeSetting( EDA_DRAW_PANEL_GAL::GAL_TYPE_CAIRO );
-
-                // Switch to OpenGL, which will save the new setting if successful
-                GetToolManager()->RunAction( ACTIONS::acceleratedGraphics, true );
-
-                // Switch back to Cairo if OpenGL is not supported
-                if( GetCanvas()->GetBackend() == EDA_DRAW_PANEL_GAL::GAL_TYPE_NONE )
-                    GetToolManager()->RunAction( ACTIONS::standardGraphics, true );
-            }
-            else
-            {
-                // If they were on legacy, switch to Cairo
-                GetToolManager()->RunAction( ACTIONS::standardGraphics, true );
-            }
-        }
-
-        m_firstRunDialogSetting = 1;
-        SaveSettings( config() );
-    }
 
     InitExitKey();
     setupUnits( config() );