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

Gerbview: fix broken XOR mode 

Fixes: https://gitlab.com/kicad/code/kicad/-/issues/10122
This commit is contained in:
Mike Williams 2022-12-19 10:58:40 -05:00
parent cbb70f0da1
commit 1f178e2b93
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gerbview/gerbview_frame.cpp
View File

@ -573,8 +573,8 @@ void GERBVIEW_FRAME::UpdateXORLayers()
{ {
view->SetLayerDiff( GERBER_DRAW_LAYER( i ), gvconfig()->m_Display.m_XORMode ); view->SetLayerDiff( GERBER_DRAW_LAYER( i ), gvconfig()->m_Display.m_XORMode );
// Caching doesn't work with layered rendering of diff'd layers // Caching doesn't work with layered rendering of XOR'd layers
if( gvconfig()->m_Display.m_DiffMode ) if( gvconfig()->m_Display.m_XORMode )
view->SetLayerTarget( GERBER_DRAW_LAYER( i ), KIGFX::TARGET_NONCACHED ); view->SetLayerTarget( GERBER_DRAW_LAYER( i ), KIGFX::TARGET_NONCACHED );
else else
view->SetLayerTarget( GERBER_DRAW_LAYER( i ), target ); view->SetLayerTarget( GERBER_DRAW_LAYER( i ), target );
@ -1081,10 +1081,10 @@ void GERBVIEW_FRAME::setupUIConditions()
}; };
auto xorModeCond = auto xorModeCond =
[this] ( const SELECTION& ) [this] ( const SELECTION& )
{ {
return gvconfig()->m_Display.m_XORMode; return gvconfig()->m_Display.m_XORMode;
}; };
auto highContrastModeCond = auto highContrastModeCond =
[this] ( const SELECTION& ) [this] ( const SELECTION& )

5
gerbview/tools/gerbview_control.cpp
View File

@ -309,10 +309,9 @@ int GERBVIEW_CONTROL::DisplayControl( const TOOL_EVENT& aEvent )
cfg->m_Display.m_DiffMode = !cfg->m_Display.m_DiffMode; cfg->m_Display.m_DiffMode = !cfg->m_Display.m_DiffMode;
if( cfg->m_Display.m_DiffMode && cfg->m_Display.m_XORMode ) if( cfg->m_Display.m_DiffMode && cfg->m_Display.m_XORMode )
{
cfg->m_Display.m_XORMode = false; cfg->m_Display.m_XORMode = false;
m_frame->UpdateXORLayers();
} m_frame->UpdateXORLayers();
} }
else if( aEvent.IsAction( &GERBVIEW_ACTIONS::toggleXORMode ) ) else if( aEvent.IsAction( &GERBVIEW_ACTIONS::toggleXORMode ) )
{ {