Fixing issue 966: ""Gripped" image movement not matching image scale." regarding the label of the tool, and issue 970: "Factor 1 in "Panning acceleration" works only in 1:1 view"

This commit is contained in:
natureh
2011-09-05 01:38:08 +02:00
parent 249d372531
commit 7a6bafed2f
3 changed files with 9 additions and 5 deletions

View File

@@ -380,9 +380,13 @@ void CropWindow::pointerMoved (int x, int y) {
iarea->redraw ();
}
else if (state==SCropImgMove) {
double accel = options.panAccelFactor * zoomSteps[cropZoom].zoom;
action_x = (press_x - x) / zoomSteps[cropZoom].zoom * accel;
action_y = (press_y - y) / zoomSteps[cropZoom].zoom * accel;
// multiplier is the amplification factor ; disabled if the user selected "1" (no amplification)
double factor = options.panAccelFactor == 1 ? 1.0 : options.panAccelFactor * zoomSteps[cropZoom].zoom;
// never move the preview slower than the cursor
if (factor < 1.0)
factor = 1.0;
action_x = (press_x - x) / zoomSteps[cropZoom].zoom * factor;
action_y = (press_y - y) / zoomSteps[cropZoom].zoom * factor;
for (std::list<CropWindowListener*>::iterator i=listeners.begin(); i!=listeners.end(); i++)
(*i)->cropPositionChanged (this);
iarea->redraw ();