summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdrian Boguszewski <adrbogus1@student.pg.gda.pl>2016-05-15 19:47:09 +0000
committerAdrian Boguszewski <adrbogus1@student.pg.gda.pl>2016-05-15 19:47:09 +0000
commitb24b02a0474d6bdaba2e5a77fe91e285217abccd (patch)
tree6abbb3266d84632424a09456f550793b81474bff /src
parentmodify build files for COPYING.LIB->LGPL2.1.txt, as per http://article.gmane.... (diff)
downloadinkscape-b24b02a0474d6bdaba2e5a77fe91e285217abccd.tar.gz
inkscape-b24b02a0474d6bdaba2e5a77fe91e285217abccd.zip
Added normalized path to flowtext
Fixed bugs: - https://launchpad.net/bugs/1555152 (bzr r14889)
Diffstat (limited to 'src')
-rw-r--r--src/sp-flowtext.h5
-rw-r--r--src/splivarot.cpp5
2 files changed, 9 insertions, 1 deletions
diff --git a/src/sp-flowtext.h b/src/sp-flowtext.h
index 9e6046469..9ee676893 100644
--- a/src/sp-flowtext.h
+++ b/src/sp-flowtext.h
@@ -49,6 +49,11 @@ public:
bool _optimizeScaledText;
+ /** Converts the text object to its component curves */
+ SPCurve *getNormalizedBpath() const {
+ return layout.convertToCurves();
+ }
+
/** Optimize scaled flow text on next set_transform. */
void optimizeScaledText()
{_optimizeScaledText = true;}
diff --git a/src/splivarot.cpp b/src/splivarot.cpp
index c37df151c..1bc6da3e1 100644
--- a/src/splivarot.cpp
+++ b/src/splivarot.cpp
@@ -1776,11 +1776,14 @@ sp_selected_path_do_offset(SPDesktop *desktop, bool expand, double prefOffset)
SPItem *item = *l;
SPCurve *curve = NULL;
- if (!SP_IS_SHAPE(item) && !SP_IS_TEXT(item))
+ if (!SP_IS_SHAPE(item) && !SP_IS_TEXT(item) && !SP_IS_FLOWTEXT(item))
continue;
else if (SP_IS_SHAPE(item)) {
curve = SP_SHAPE(item)->getCurve();
}
+ else if (SP_IS_FLOWTEXT(item)) {
+ curve = SP_FLOWTEXT(item)->getNormalizedBpath();
+ }
else { // Item must be SP_TEXT
curve = SP_TEXT(item)->getNormalizedBpath();
}