diff options
| author | Jabiertxof <jabier.arraiza@marker.es> | 2019-09-04 19:38:00 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-09-07 21:48:33 +0000 |
| commit | b39deb401d5d34abceb5ee8caad920b70d734205 (patch) | |
| tree | bd3134ff6873e1ed7e684e026d9f748ce3b23617 /src/ui/toolbar | |
| parent | Add Text direction icons (diff) | |
| download | inkscape-b39deb401d5d34abceb5ee8caad920b70d734205.tar.gz inkscape-b39deb401d5d34abceb5ee8caad920b70d734205.zip | |
fixx flowbox on SVG2 mode using tspans
Diffstat (limited to 'src/ui/toolbar')
| -rw-r--r-- | src/ui/toolbar/text-toolbar.cpp | 36 |
1 files changed, 4 insertions, 32 deletions
diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp index 042b66e6c..9fc33a391 100644 --- a/src/ui/toolbar/text-toolbar.cpp +++ b/src/ui/toolbar/text-toolbar.cpp @@ -1299,11 +1299,7 @@ TextToolbar::lineheight_value_changed() sp_repr_css_set_property(cssfit, "line-height", parent_lineheight.c_str()); double minheight = 0; if (parent_style) { - if (parent_style->line_height.normal) { - minheight = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL; - } else { - minheight = parent_style->line_height.computed; - } + minheight = parent_style->line_height.computed; } if (minheight) { for (auto i : parent->childList(false)) { @@ -1311,17 +1307,7 @@ TextToolbar::lineheight_value_changed() if (!child) { continue; } - double childheight = 0; - if (child->style) { - if (child->style->line_height.normal) { - childheight = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL; - } else { - childheight = child->style->line_height.computed; - } - } - if (minheight == childheight) { - recursively_set_properties(child, cssfit); - } + recursively_set_properties(child, cssfit); } } sp_repr_css_set_property(cssfit, "line-height", "0"); @@ -1509,11 +1495,7 @@ TextToolbar::lineheight_unit_changed(int /* Not Used */) sp_repr_css_set_property(cssfit, "line-height", parent_lineheight.c_str()); double minheight = 0; if (parent_style) { - if (parent_style->line_height.normal) { - minheight = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL; - } else { - minheight = parent_style->line_height.computed; - } + minheight = parent_style->line_height.computed; } if (minheight) { for (auto i : parent->childList(false)) { @@ -1521,17 +1503,7 @@ TextToolbar::lineheight_unit_changed(int /* Not Used */) if (!child) { continue; } - double childheight = 0; - if (child->style) { - if (child->style->line_height.normal) { - childheight = Inkscape::Text::Layout::LINE_HEIGHT_NORMAL; - } else { - childheight = child->style->line_height.computed; - } - } - if (minheight == childheight) { - recursively_set_properties(child, cssfit); - } + recursively_set_properties(child, cssfit); } } sp_repr_css_set_property(cssfit, "line-height", "0"); |