summaryrefslogtreecommitdiffstats
path: root/src/live_effects/parameter/text.cpp
diff options
context:
space:
mode:
authorDiederik van Lierop <mail@diedenrezi.nl>2012-01-01 15:46:12 +0000
committerDiederik van Lierop <mail@diedenrezi.nl>2012-01-01 15:46:12 +0000
commit6a7bd5175bba266e10ff5eac5c630ec3115b2e19 (patch)
treee3982ca0e391ecc060d2f7403e77a936783979a2 /src/live_effects/parameter/text.cpp
parentItem and image properties dialog update: restoring correct behaviour in case ... (diff)
downloadinkscape-6a7bd5175bba266e10ff5eac5c630ec3115b2e19.tar.gz
inkscape-6a7bd5175bba266e10ff5eac5c630ec3115b2e19.zip
1) Fix CanvasText alignment bugs caused by static variables, uninitialized variables, and variable border width
2) Snap tooltips no longer overlap with measure tool tooltips, and now have a background color (similar to the measure tool) (bzr r10816)
Diffstat (limited to 'src/live_effects/parameter/text.cpp')
-rw-r--r--src/live_effects/parameter/text.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/live_effects/parameter/text.cpp b/src/live_effects/parameter/text.cpp
index 0c0c3d69c..2c17a23a5 100644
--- a/src/live_effects/parameter/text.cpp
+++ b/src/live_effects/parameter/text.cpp
@@ -62,10 +62,12 @@ TextParam::setPosAndAnchor(const Geom::Piecewise<Geom::D2<Geom::SBasis> > &pwd2,
Point pos = pwd2_reparam.valueAt(t_reparam);
Point dir = unit_vector(derivative(pwd2_reparam).valueAt(t_reparam));
Point n = -rot90(dir);
- double angle = Geom::angle_between(dir, Point(1,0));
+ // double angle = Geom::angle_between(dir, Point(1,0));
sp_canvastext_set_coords(canvas_text, pos + n * length);
- sp_canvastext_set_anchor(canvas_text, std::sin(angle), -std::cos(angle));
+ // Canvastext currently no longer allows for setting a custom anchor position,
+ // This functionality was broken as of rev. #10331 (2011-06-21), and for now completely removed as of 2012-01-01
+ //sp_canvastext_set_anchor(canvas_text, std::sin(angle), -std::cos(angle));
}
void
@@ -73,7 +75,7 @@ TextParam::setAnchor(double x_value, double y_value)
{
anchor_x = x_value;
anchor_y = y_value;
- sp_canvastext_set_anchor (canvas_text, anchor_x, anchor_y);
+ //sp_canvastext_set_anchor (canvas_text, anchor_x, anchor_y);
}
bool