![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/seltrans.cpp b/src/seltrans.cpp
index 1a8c69827426836d4eb0d2ed04a5c02e23ed5a80..a301c8158324a537d853a0b10958caeddd27e4d4 100644 (file)
--- a/src/seltrans.cpp
+++ b/src/seltrans.cpp
_updateVolatileState();
+ _center_is_set = false; // reread _center from items, or set to bbox midpoint
+
_updateHandles();
_selection = SP_DT_SELECTION(desktop);
"stroke_color", 0x000000a0,
"pixbuf", handles[12],
NULL);
-
+
_grip = sp_canvas_item_new(SP_DT_CONTROLS(desktop),
SP_TYPE_CTRL,
"anchor", GTK_ANCHOR_CENTER,
"stroke_color", 0xffffffff,
"pixbuf", handles[12],
NULL);
-
+
sp_canvas_item_hide(_grip);
sp_canvas_item_hide(_norm);
}
_items.clear();
+ _items_centers.clear();
}
void Inkscape::SelTrans::resetState()
_state = STATE_SCALE;
}
+ _center_is_set = true; // no need to reread center
+
_updateHandles();
}
void Inkscape::SelTrans::setCenter(NR::Point const &p)
{
_center = p;
+ _center_is_set = true;
// Write the new center position into all selected items
for (GSList const *l = _desktop->selection->itemList(); l; l = l->next) {
@@ -240,6 +246,7 @@ void Inkscape::SelTrans::grab(NR::Point const &p, gdouble x, gdouble y, bool sho
for (GSList const *l = selection->itemList(); l; l = l->next) {
SPItem *it = (SPItem*)sp_object_ref(SP_OBJECT(l->data), NULL);
_items.push_back(std::pair<SPItem *, NR::Matrix>(it, sp_item_i2d_affine(it)));
+ _items_centers.push_back(std::pair<SPItem *, NR::Point>(it, it->getCenter())); // for content-dragging, we need to remember original centers
}
_current.set_identity();
if (!_empty && _changed) {
sp_selection_apply_affine(selection, _current, (_show == SHOW_OUTLINE)? true : false);
_center *= _current;
-
- // Transform may have changed the objects' bboxes, so we need to write the _center into them again
- for (unsigned i = 0; i < _items.size(); i++) {
- SPItem *currentItem = _items[i].first;
- if (currentItem->isCenterSet() || _current[1] != 0 || _current[2] != 0) { // only if it's already set, or if it's a rotation/skew
- currentItem->setCenter (_center);
- SP_OBJECT(currentItem)->updateRepr();
+ _center_is_set = true;
+
+// If dragging showed content live, sp_selection_apply_affine cannot change the centers
+// appropriately - it does not know the original positions of the centers (all objects already have
+// the new bboxes). So we need to reset the centers from our saved array.
+ if (_show != SHOW_OUTLINE && !_current.is_translation()) {
+ for (unsigned i = 0; i < _items_centers.size(); i++) {
+ SPItem *currentItem = _items_centers[i].first;
+ if (currentItem->isCenterSet()) { // only if it's already set
+ currentItem->setCenter (_items_centers[i].second * _current);
+ SP_OBJECT(currentItem)->updateRepr();
+ }
}
}
sp_object_unref(SP_OBJECT(_items[i].first), NULL);
}
_items.clear();
+ _items_centers.clear();
_grabbed = false;
_show_handles = true;
// center handle
if ( _chandle == NULL ) {
- _chandle = sp_knot_new(_desktop);
- g_object_set(G_OBJECT(_chandle),
- "anchor", handle_center.anchor,
- "shape", SP_CTRL_SHAPE_BITMAP,
- "size", 13,
- "mode", SP_CTRL_MODE_XOR,
- "fill", 0x00000000,
- "fill_mouseover", 0x00000000,
- "stroke", 0x000000ff,
- "stroke_mouseover", 0xff0000b0,
- "pixbuf", handles[handle_center.control],
- "tip", _("<b>Center</b> of rotation and skewing: drag to reposition; scaling with Shift also uses this center"),
- NULL);
+ _chandle = sp_knot_new(_desktop, _("<b>Center</b> of rotation and skewing: drag to reposition; scaling with Shift also uses this center"));
+
+ _chandle->setShape (SP_CTRL_SHAPE_BITMAP);
+ _chandle->setSize (13);
+ _chandle->setAnchor (handle_center.anchor);
+ _chandle->setMode (SP_CTRL_MODE_XOR);
+ _chandle->setFill(0x00000000, 0x00000000, 0x00000000);
+ _chandle->setStroke(0x000000ff, 0xff0000b0, 0xff0000b0);
+ _chandle->setPixbuf(handles[handle_center.control]);
+ sp_knot_update_ctrl(_chandle);
+
g_signal_connect(G_OBJECT(_chandle), "request",
G_CALLBACK(sp_sel_trans_handle_request), (gpointer) &handle_center);
g_signal_connect(G_OBJECT(_chandle), "moved",
_("<b>Rotate</b> selection; with <b>Ctrl</b> to snap angle; with <b>Shift</b> to rotate around the opposite corner"));
}
- // Extract the position of the center from the first selected object
- GSList *items = (GSList *) _desktop->selection->itemList();
- if (items) {
- SPItem *first = reinterpret_cast<SPItem*>(g_slist_last(items)->data); // from the first item in selection
- if (first->isCenterSet()) { // only if set explicitly
- _center = first->getCenter();
- } else {
- _center = _box.midpoint();
- }
- } else {
- _center = _box.midpoint();
+ if (!_center_is_set) {
+ _center = _desktop->selection->center();
+ _center_is_set = true;
}
if ( _state == STATE_SCALE ) {
@@ -523,19 +526,16 @@ void Inkscape::SelTrans::_showHandles(SPKnot *knot[], SPSelTransHandle const han
for (int i = 0; i < num; i++) {
if (knot[i] == NULL) {
- knot[i] = sp_knot_new(_desktop);
- g_object_set(G_OBJECT(knot[i]),
- "anchor", handle[i].anchor,
- "shape", SP_CTRL_SHAPE_BITMAP,
- "size", 13,
- "mode", SP_KNOT_MODE_XOR,
- "fill", 0x000000ff, // inversion
- "fill_mouseover", 0x00ff6600, // green
- "stroke", 0x000000ff, // inversion
- "stroke_mouseover", 0x000000ff, // inversion
- "pixbuf", handles[handle[i].control],
- "tip", i % 2 ? even_tip : odd_tip,
- NULL);
+ knot[i] = sp_knot_new(_desktop, i % 2 ? even_tip : odd_tip);
+
+ knot[i]->setShape (SP_CTRL_SHAPE_BITMAP);
+ knot[i]->setSize (13);
+ knot[i]->setAnchor (handle[i].anchor);
+ knot[i]->setMode (SP_CTRL_MODE_XOR);
+ knot[i]->setFill(0x000000ff, 0x00ff6600, 0x00ff6600); // inversion, green, green
+ knot[i]->setStroke(0x000000ff, 0x000000ff, 0x000000ff); // inversion
+ knot[i]->setPixbuf(handles[handle[i].control]);
+ sp_knot_update_ctrl(knot[i]);
g_signal_connect(G_OBJECT(knot[i]), "request",
G_CALLBACK(sp_sel_trans_handle_request), (gpointer) &handle[i]);
@@ -662,7 +662,7 @@ gboolean Inkscape::SelTrans::handleRequest(SPKnot *knot, NR::Point *position, gu
knot->desktop->set_coordinate_status(*position);
knot->desktop->setPosition(*position);
-
+
if (state & GDK_MOD1_MASK) {
*position = _point + ( *position - _point ) / 10;
}
{
if (!_grabbed) {
_updateVolatileState();
+ _center_is_set = false; // center(s) may have changed
_updateHandles();
}
}
@@ -698,6 +699,8 @@ void Inkscape::SelTrans::_selModified(Inkscape::Selection *selection, guint flag
// reset internal flag
_changed = false;
+ _center_is_set = false; // center(s) may have changed
+
_updateHandles();
}
}
@@ -869,7 +872,7 @@ gboolean Inkscape::SelTrans::stretchRequest(SPSelTransHandle const &handle, NR::
for (GSList const *i = _selection->itemList(); i != NULL; i = i->next) {
it.push_back(reinterpret_cast<SPItem*>(i->data));
}
-
+
if ( state & GDK_CONTROL_MASK ) {
s[perp] = fabs(s[axis]);
@@ -1103,7 +1106,7 @@ void sp_sel_trans_rotate(Inkscape::SelTrans *seltrans, SPSelTransHandle const &,
{
seltrans->rotate(pt, state);
}
-
+
void Inkscape::SelTrans::stretch(SPSelTransHandle const &handle, NR::Point &pt, guint state)
{
using NR::X;
@@ -1148,7 +1151,7 @@ void Inkscape::SelTrans::stretch(SPSelTransHandle const &handle, NR::Point &pt,
NR::Point new_bbox_max = _box.max() * (NR::translate(-scale_origin) * NR::Matrix(s) * NR::translate(scale_origin));
int transform_stroke = prefs_get_int_attribute ("options.transform", "stroke", 1);
- NR::Matrix scaler = get_scale_transform_with_stroke (_box, _strokewidth, transform_stroke,
+ NR::Matrix scaler = get_scale_transform_with_stroke (_box, _strokewidth, transform_stroke,
new_bbox_min[NR::X], new_bbox_min[NR::Y], new_bbox_max[NR::X], new_bbox_max[NR::Y]);
transform(scaler, NR::Point(0, 0)); // we have already accounted for origin, so pass 0,0
NR::Point new_bbox_max = _box.max() * (NR::translate(-_origin) * NR::Matrix(s) * NR::translate(_origin));
int transform_stroke = prefs_get_int_attribute ("options.transform", "stroke", 1);
- NR::Matrix scaler = get_scale_transform_with_stroke (_box, _strokewidth, transform_stroke,
+ NR::Matrix scaler = get_scale_transform_with_stroke (_box, _strokewidth, transform_stroke,
new_bbox_min[NR::X], new_bbox_min[NR::Y], new_bbox_max[NR::X], new_bbox_max[NR::Y]);
transform(scaler, NR::Point(0, 0)); // we have already accounted for origin, so pass 0,0
@@ -1239,7 +1242,7 @@ void sp_sel_trans_center(Inkscape::SelTrans *seltrans, SPSelTransHandle const &,
void Inkscape::SelTrans::moveTo(NR::Point const &xy, guint state)
{
SnapManager const m(_desktop->namedview);
-
+
/* The amount that we've moved by during this drag */
NR::Point dxy = xy - _point;
/* This will be our list of possible translations */
std::list<std::pair<NR::Point, bool> > s;
-
+
if (control) {
-
+
/* Snap to things, and also constrain to horizontal or vertical movement */
for (unsigned int dim = 0; dim < 2; dim++) {
_snap_points,
component_vectors[dim], it, dxy));
}
-
+
} else {
/* Snap to things with no constraint */
}
}
}
-
+
if (control) {
/* Ensure that the horizontal and vertical constraint has been applied */
if (fabs(dxy[NR::X]) > fabs(dxy[NR::Y])) {
dxy[NR::X] = 0;
}
}
-
+
NR::Matrix const move((NR::translate(dxy)));
NR::Point const norm(0, 0);
transform(move, norm);