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

bugfix: Blank footprint viewer in legacy canvas.

This commit is contained in:
Maciej Suminski 2015-07-02 21:25:39 +02:00
parent 766da1e494
commit 705c4ef4c5
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
common/draw_frame.cpp
View File

@ -1025,9 +1025,6 @@ void EDA_DRAW_FRAME::AdjustScrollBars( const wxPoint& aCenterPositionIU )
void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable ) void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
{ {
if( m_galCanvasActive == aEnable )
return;
KIGFX::VIEW* view = GetGalCanvas()->GetView(); KIGFX::VIEW* view = GetGalCanvas()->GetView();
KIGFX::GAL* gal = GetGalCanvas()->GetGAL(); KIGFX::GAL* gal = GetGalCanvas()->GetGAL();
@ -1035,12 +1032,16 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
BASE_SCREEN* screen = GetScreen(); BASE_SCREEN* screen = GetScreen();
// Display the same view after canvas switching // Display the same view after canvas switching
if( aEnable ) // Switch to GAL rendering if( aEnable )
{ {
// Set up viewport // Switch to GAL rendering
double zoom = 1.0 / ( zoomFactor * m_canvas->GetZoom() ); if( !m_galCanvasActive )
view->SetScale( zoom ); {
view->SetCenter( VECTOR2D( m_canvas->GetScreenCenterLogicalPosition() ) ); // Set up viewport
double zoom = 1.0 / ( zoomFactor * m_canvas->GetZoom() );
view->SetScale( zoom );
view->SetCenter( VECTOR2D( m_canvas->GetScreenCenterLogicalPosition() ) );
}
// Set up grid settings // Set up grid settings
gal->SetGridVisibility( IsGridVisible() ); gal->SetGridVisibility( IsGridVisible() );
@ -1049,9 +1050,9 @@ void EDA_DRAW_FRAME::UseGalCanvas( bool aEnable )
GetToolManager()->RunAction( "pcbnew.Control.switchCursor" ); GetToolManager()->RunAction( "pcbnew.Control.switchCursor" );
} }
else // Switch to standard rendering else if( m_galCanvasActive )
{ {
// Change view settings only if GAL was active previously // Switch to standard rendering
double zoom = 1.0 / ( zoomFactor * view->GetScale() ); double zoom = 1.0 / ( zoomFactor * view->GetScale() );
m_canvas->SetZoom( zoom ); m_canvas->SetZoom( zoom );