summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/desktop.h2
-rw-r--r--src/verbs.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/desktop.h b/src/desktop.h
index 5e1bca975..a8d93278b 100644
--- a/src/desktop.h
+++ b/src/desktop.h
@@ -553,7 +553,7 @@ private:
private:
void _update() {
- _d2w = _rotate * _scale * _flip;
+ _d2w = _scale * _rotate * _flip;
_w2d = _d2w.inverse();
}
Geom::Affine _w2d; // Window to desktop
diff --git a/src/verbs.cpp b/src/verbs.cpp
index 63c5295f8..32c2a850c 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -1948,12 +1948,12 @@ void ZoomVerb::perform(SPAction *action, void *data)
SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve;
if (!rc->is_empty()) {
Geom::Point const rotate_to (*rc->last_point());
- dt->rotate_relative_keep_point(rotate_to, -mul*rotate_inc);
+ dt->rotate_relative_keep_point(rotate_to, mul * rotate_inc);
break;
}
}
- dt->rotate_relative_center_point( midpoint, -mul*rotate_inc);
+ dt->rotate_relative_center_point(midpoint, mul * rotate_inc);
break;
}
case SP_VERB_ROTATE_CCW:
@@ -1964,16 +1964,16 @@ void ZoomVerb::perform(SPAction *action, void *data)
SPCurve *rc = SP_DRAW_CONTEXT(ec)->red_curve;
if (!rc->is_empty()) {
Geom::Point const rotate_to (*rc->last_point());
- dt->rotate_relative_keep_point(rotate_to, mul*rotate_inc);
+ dt->rotate_relative_keep_point(rotate_to, -mul * rotate_inc);
break;
}
}
- dt->rotate_relative_center_point( midpoint, mul*rotate_inc);
+ dt->rotate_relative_center_point(midpoint, -mul * rotate_inc);
break;
}
case SP_VERB_ROTATE_ZERO:
- dt->rotate_absolute_center_point( midpoint, 0.0 );
+ dt->rotate_absolute_center_point(midpoint, 0.0);
break;
case SP_VERB_FLIP_HORIZONTAL:
{