realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-15 02:33:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make zoom-to-fit margin big enough for infobar.

Browse Source 
Otherwise part of the document is obscured behind it by default.
This commit is contained in:
Jeff Young 2021-06-19 22:16:17 +01:00
parent 24e7924997
commit 937f5138db
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
common/tool/common_tools.cpp
View File

@ -323,33 +323,27 @@ int COMMON_TOOLS::doZoomFit( ZOOM_FIT_TYPE_T aFitType )
return 0; return 0;
} }
// Reserve a 2% margin around bounding boxes. // Reserve enough margin to limit the amount of the view that might be obscured behind the
double margin_scale_factor = 1.02; // infobar.
double margin_scale_factor = 1.04;
switch( aFitType ) if( canvas->GetClientSize().y < 768 )
margin_scale_factor = 1.10;
if( aFitType == ZOOM_FIT_ALL )
{ {
case ZOOM_FIT_ALL:
// Leave a bigger margin for library editors & viewers // Leave a bigger margin for library editors & viewers
if( frame->IsType( FRAME_FOOTPRINT_VIEWER ) || frame->IsType( FRAME_FOOTPRINT_VIEWER_MODAL ) if( frame->IsType( FRAME_FOOTPRINT_VIEWER ) || frame->IsType( FRAME_FOOTPRINT_VIEWER_MODAL )
|| frame->IsType( FRAME_SCH_VIEWER ) || frame->IsType( FRAME_SCH_VIEWER_MODAL ) ) || frame->IsType( FRAME_SCH_VIEWER ) || frame->IsType( FRAME_SCH_VIEWER_MODAL ) )
{ {
margin_scale_factor = 1.4; margin_scale_factor = 1.30;
} }
else if( frame->IsType( FRAME_SCH_SYMBOL_EDITOR ) else if( frame->IsType( FRAME_SCH_SYMBOL_EDITOR )
|| frame->IsType( FRAME_FOOTPRINT_EDITOR ) ) || frame->IsType( FRAME_FOOTPRINT_EDITOR ) )
{ {
margin_scale_factor = 2; margin_scale_factor = 1.48;
} }
break;
// Currently the same value as "ZOOM_FIT_ALL" but allows easy expansion/change in the future.
case ZOOM_FIT_OBJECTS:
margin_scale_factor = 1.02; // Reserve a 2% margin around bounding box.
break;
default:
margin_scale_factor = 1.02;
} }
view->SetScale( scale / margin_scale_factor ); view->SetScale( scale / margin_scale_factor );