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

Fix a serious error in SetActiveLayer(): a GAL specific method was called even if a GAL mode was not active

This commit is contained in:
jean-pierre charras 2017-01-31 09:33:44 +01:00
parent 6ae65b4cba
commit b66cb871e6
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pcbnew/modedit.cpp
View File

@ -979,11 +979,12 @@ void FOOTPRINT_EDIT_FRAME::SetActiveLayer( LAYER_ID aLayer )
{ {
PCB_BASE_FRAME::SetActiveLayer( aLayer ); PCB_BASE_FRAME::SetActiveLayer( aLayer );
GetGalCanvas()->SetHighContrastLayer( aLayer );
m_Layers->SelectLayer( GetActiveLayer() ); m_Layers->SelectLayer( GetActiveLayer() );
m_Layers->OnLayerSelected(); m_Layers->OnLayerSelected();
if( IsGalCanvasActive() ) if( IsGalCanvasActive() )
{
GetGalCanvas()->SetHighContrastLayer( aLayer );
GetGalCanvas()->Refresh(); GetGalCanvas()->Refresh();
}
} }

4
pcbnew/pcbframe.cpp
View File

@ -877,14 +877,14 @@ void PCB_EDIT_FRAME::SetActiveLayer( LAYER_ID aLayer )
{ {
PCB_BASE_FRAME::SetActiveLayer( aLayer ); PCB_BASE_FRAME::SetActiveLayer( aLayer );
GetGalCanvas()->SetHighContrastLayer( aLayer );
syncLayerWidgetLayer(); syncLayerWidgetLayer();
if( IsGalCanvasActive() ) if( IsGalCanvasActive() )
{ {
m_toolManager->RunAction( COMMON_ACTIONS::layerChanged ); // notify other tools m_toolManager->RunAction( COMMON_ACTIONS::layerChanged ); // notify other tools
GetGalCanvas()->SetFocus(); // otherwise hotkeys are stuck somewhere GetGalCanvas()->SetFocus(); // otherwise hotkeys are stuck somewhere
GetGalCanvas()->SetHighContrastLayer( aLayer );
GetGalCanvas()->Refresh(); GetGalCanvas()->Refresh();
} }
} }