haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reduce auto.

This commit is contained in:
Jeff Young 2021-11-09 11:59:25 +00:00
parent 39474921d9
commit 18d9f6e323
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pcbnew/pcb_base_frame.cpp
View File

@ -809,24 +809,23 @@ void PCB_BASE_FRAME::ActivateGalCanvas()
EDA_DRAW_FRAME::ActivateGalCanvas(); EDA_DRAW_FRAME::ActivateGalCanvas();
EDA_DRAW_PANEL_GAL* canvas = GetCanvas(); EDA_DRAW_PANEL_GAL* canvas = GetCanvas();
KIGFX::VIEW* view = canvas->GetView();
if( m_toolManager ) if( m_toolManager )
{ {
m_toolManager->SetEnvironment( m_pcb, GetCanvas()->GetView(), m_toolManager->SetEnvironment( m_pcb, view, canvas->GetViewControls(), config(), this );
GetCanvas()->GetViewControls(), config(), this );
m_toolManager->ResetTools( TOOL_BASE::GAL_SWITCH );
} }
if( m_toolManager ) KIGFX::PCB_PAINTER* painter = static_cast<KIGFX::PCB_PAINTER*>( view->GetPainter() );
m_toolManager->ResetTools( TOOL_BASE::GAL_SWITCH ); KIGFX::PCB_RENDER_SETTINGS* settings = painter->GetSettings();
const PCB_DISPLAY_OPTIONS& displ_opts = GetDisplayOptions();
// Transfer latest current display options from legacy to GAL canvas:
auto painter = static_cast<KIGFX::PCB_PAINTER*>( canvas->GetView()->GetPainter() );
auto settings = painter->GetSettings();
auto displ_opts = GetDisplayOptions();
settings->LoadDisplayOptions( displ_opts, ShowPageLimits() ); settings->LoadDisplayOptions( displ_opts, ShowPageLimits() );
settings->LoadColors( GetColorSettings() ); settings->LoadColors( GetColorSettings() );
canvas->GetView()->RecacheAllItems(); view->RecacheAllItems();
canvas->SetEventDispatcher( m_toolDispatcher ); canvas->SetEventDispatcher( m_toolDispatcher );
canvas->StartDrawing(); canvas->StartDrawing();
} }