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

Zoom to fit: only consider worksheet if there are no other items 

(cherry picked from commit 04d6ec7de7e7f90482310311fcee416e8ed6410f)
This commit is contained in:
Jon Evans 2019-05-29 20:51:48 -04:00
parent 1e58b09d96
commit 64b71644bb
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/tool/common_tools.cpp
View File

@ -237,14 +237,7 @@ int COMMON_TOOLS::ZoomFitScreen( const TOOL_EVENT& aEvent )
VECTOR2D screenSize = view->ToWorld( galCanvas->GetClientSize(), false ); VECTOR2D screenSize = view->ToWorld( galCanvas->GetClientSize(), false );
if( bBox.GetWidth() == 0 || bBox.GetHeight() == 0 ) if( bBox.GetWidth() == 0 || bBox.GetHeight() == 0 )
{
bBox = defaultBox; bBox = defaultBox;
}
else if( defaultBox.GetWidth() > 0 && defaultBox.GetHeight() > 0 )
{
// Ensure worksheet is included in bounding box
bBox.Merge( defaultBox );
}
VECTOR2D vsize = bBox.GetSize(); VECTOR2D vsize = bBox.GetSize();
double scale = view->GetScale() / std::max( fabs( vsize.x / screenSize.x ), double scale = view->GetScale() / std::max( fabs( vsize.x / screenSize.x ),