Text alignment is now taken into account when snapping a text object

[inkscape.git] / src / sp-text.cpp

diff --git a/src/sp-text.cpp b/src/sp-text.cpp
index 91a8a03617247c3b567569edb284ceb41534a356..87c67c646184e847aa74dc7a4b000d6f50a05d89 100644 (file)
--- a/src/sp-text.cpp
+++ b/src/sp-text.cpp
@@ -430,11 +430,32 @@ sp_text_description(SPItem *item)
 
 static void sp_text_snappoints(SPItem const *item, bool const target, SnapPointsWithType &p, Inkscape::SnapPreferences const */*snapprefs*/)
 {
-    // the baseline anchor of the first char
+    // Choose a point on the baseline for snapping from or to, with the horizontal position
+       // of this point depending on the text alignment (left vs. right)
     Inkscape::Text::Layout const *layout = te_get_layout((SPItem *) item);
     if(layout != NULL) {
-        int type = target ? int(Inkscape::SNAPTARGET_HANDLE) : int(Inkscape::SNAPSOURCE_HANDLE);
-       p.push_back(std::make_pair(layout->characterAnchorPoint(layout->begin()) * sp_item_i2d_affine(item), type));
+        int type = target ? int(Inkscape::SNAPTARGET_TEXT_BASELINE) : int(Inkscape::SNAPSOURCE_TEXT_BASELINE);
+
+        Inkscape::Text::Layout::iterator pos = layout->begin();
+        Inkscape::Text::Layout::Alignment text_alignment = layout->paragraphAlignment(pos);
+
+        Geom::Point left_pt = layout->characterAnchorPoint(pos) * sp_item_i2d_affine(item);
+               pos.thisEndOfLine();
+               Geom::Point right_pt = layout->characterAnchorPoint(pos) * sp_item_i2d_affine(item);
+               Geom::Point mid_pt = (left_pt + right_pt)/2;
+
+        switch (text_alignment) {
+                       case Inkscape::Text::Layout::LEFT:
+                       case Inkscape::Text::Layout::FULL:
+                               p.push_back(std::make_pair(left_pt, type));
+                               break;
+                       case Inkscape::Text::Layout::CENTER:
+                               p.push_back(std::make_pair(mid_pt, type));
+                               break;
+                       default: //RIGHT
+                               p.push_back(std::make_pair(right_pt, type));
+                               break;
+        }
     }
 }
 
@@ -937,11 +958,11 @@ void TextTagAttributes::addToRotate(unsigned index, double delta)
     SVGLength zero_length;
     zero_length = 0.0;
 
-    if (attributes.rotate.size() < index + 1) {
+    if (attributes.rotate.size() < index + 2) {
         if (attributes.rotate.empty())
-            attributes.rotate.resize(index + 1, zero_length);
+            attributes.rotate.resize(index + 2, zero_length);
         else
-            attributes.rotate.resize(index + 1, attributes.rotate.back());
+            attributes.rotate.resize(index + 2, attributes.rotate.back());
     }
     attributes.rotate[index] = mod360(attributes.rotate[index].computed + delta);
 }