Seth/sethLabels
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Refine zoom.

Browse Source
This commit is contained in:
Jim Evins
2013-12-10 16:52:24 -05:00
parent 75c2ceec47
commit aa88cd8f65
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/LabelModel.cpp
+1 -1
View File
@@ -29,7 +29,7 @@ namespace glabels
/** /**
* Default constructor. * Default constructor.
*/ */
LabelModel::LabelModel() : mModified(true) LabelModel::LabelModel() : mModified(true), mTmplate(0), mRotate(false)
{ {
} }
app/View.cpp
+8 -2
View File
@@ -31,7 +31,7 @@ namespace
const int nZoomLevels = 14; const int nZoomLevels = 14;
const double zoomLevels[nZoomLevels] = { 8, 6, 4, 3, 2, 1.5, 1, 0.75, 0.67, 0.50, 0.33, 0.25, 0.15, 0.10 }; const double zoomLevels[nZoomLevels] = { 8, 6, 4, 3, 2, 1.5, 1, 0.75, 0.67, 0.50, 0.33, 0.25, 0.15, 0.10 };
const double ZOOM_TO_FIT_PAD = 16; const double ZOOM_TO_FIT_PAD = 16.0;
const QColor shadowColor( 64, 64, 64 ); const QColor shadowColor( 64, 64, 64 );
const double shadowOffsetPixels = 3; const double shadowOffsetPixels = 3;
@@ -127,7 +127,7 @@ namespace glabels
void View::zoomToFit() void View::zoomToFit()
{ {
double x_scale = (72.0/physicalDpiY()) * ( width() - ZOOM_TO_FIT_PAD ) / mModel->w(); double x_scale = (72.0/physicalDpiX()) * ( width() - ZOOM_TO_FIT_PAD ) / mModel->w();
double y_scale = (72.0/physicalDpiY()) * ( height() - ZOOM_TO_FIT_PAD ) / mModel->h(); double y_scale = (72.0/physicalDpiY()) * ( height() - ZOOM_TO_FIT_PAD ) / mModel->h();
double newZoom = min( x_scale, y_scale ); double newZoom = min( x_scale, y_scale );
@@ -169,6 +169,12 @@ namespace glabels
{ {
zoomToFit(); zoomToFit();
} }
else
{
// Refresh to keep view location relative to window
resetTransform();
scale( mZoom*physicalDpiX()/72.0, mZoom*physicalDpiY()/72.0 );
}
} }