summaryrefslogtreecommitdiffstats
path: root/src/ui/toolbar/text-toolbar.cpp
diff options
context:
space:
mode:
authorJabiertxof <jabier.arraiza@marker.es>2019-09-12 17:12:26 +0000
committerJabiertxof <jabier.arraiza@marker.es>2019-09-12 17:12:26 +0000
commit65b741b487ad8ddce01eb81fb5b20f3785f05ee5 (patch)
tree5c986c20d122aa00cb0b95c26dc8657bbebc1d7b /src/ui/toolbar/text-toolbar.cpp
parentLine height fixes (diff)
downloadinkscape-65b741b487ad8ddce01eb81fb5b20f3785f05ee5.tar.gz
inkscape-65b741b487ad8ddce01eb81fb5b20f3785f05ee5.zip
Fix blocking bugs in text for Beta (stiling)
Diffstat (limited to 'src/ui/toolbar/text-toolbar.cpp')
-rw-r--r--src/ui/toolbar/text-toolbar.cpp14
1 files changed, 6 insertions, 8 deletions
diff --git a/src/ui/toolbar/text-toolbar.cpp b/src/ui/toolbar/text-toolbar.cpp
index dd56998d7..fbe40e7d0 100644
--- a/src/ui/toolbar/text-toolbar.cpp
+++ b/src/ui/toolbar/text-toolbar.cpp
@@ -2033,7 +2033,7 @@ void TextToolbar::selection_changed(Inkscape::Selection *selection) // don't bot
height = _query_cursor.line_height.value;
line_height_unit = _query_cursor.line_height.unit;
}
-
+
if (!height && result_numbers != QUERY_STYLE_NOTHING) {
height = query.line_height.value;
line_height_unit = query.line_height.unit;
@@ -2334,7 +2334,7 @@ void TextToolbar::prepare_inner()
if (flowtext) {
flowtext->rebuildLayout();
}
-
+
SPObject *current = start->parent;
SPObject *span_start = start->parent;
SPObject *span_end = end->parent;
@@ -2352,11 +2352,9 @@ void TextToolbar::prepare_inner()
SPObject *endobj = span_end;
SPObject *prevendobj = span_end;
- while (endobj->parent != SP_OBJECT(text) &&
- endobj->parent != SP_OBJECT(flowtext))
- {
+ while (endobj->parent != SP_OBJECT(text) && endobj->parent != SP_OBJECT(flowtext)) {
prevendobj = endobj;
- endobj = endobj->parent; // SPStrings don't have style
+ endobj = endobj->parent; // SPStrings don't have style
}
SPObject *container = startobj->parent;
SPObject *end_container = endobj->parent;
@@ -2364,7 +2362,7 @@ void TextToolbar::prepare_inner()
SPFlowtext *topflowtext = dynamic_cast<SPFlowtext *>(container);
if (toptext || topflowtext) {
container = startobj;
- end_container = endobj;
+ end_container = endobj;
startobj = prevstartobj;
}
std::cout << prevstartobj->getId() << std::endl;
@@ -2376,7 +2374,7 @@ void TextToolbar::prepare_inner()
if (container) {
containers.push_back(container);
}
- for(auto container : containers) {
+ for (auto container : containers) {
if (!container) {
continue;
}