diff options
| author | Jabiertxof <jtx@jtx> | 2016-12-16 22:49:53 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx> | 2016-12-16 22:49:53 +0000 |
| commit | 5927b3bf5d9d8dcc9f519b4b9060669bd2599a28 (patch) | |
| tree | 3b51f70f9b467bb016c678afcaae650e3afd395b /src/desktop-style.cpp | |
| parent | working with mirrors (diff) | |
| download | inkscape-5927b3bf5d9d8dcc9f519b4b9060669bd2599a28.tar.gz inkscape-5927b3bf5d9d8dcc9f519b4b9060669bd2599a28.zip | |
Rollback 15315
(bzr r15295.1.25)
Diffstat (limited to '')
| -rw-r--r-- | src/desktop-style.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 4c07c76ea..65e511245 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -209,7 +209,7 @@ sp_desktop_set_style(Inkscape::ObjectSet *set, SPDesktop *desktop, SPCSSAttr *cs if (!change) return; -// 2. Emit signal... See desktop->connectSetStyle in text-tool, tweak-tool, and gradient-drag. +// 2. Emit signal bool intercepted = desktop->_set_style_signal.emit(css); /** \todo @@ -1045,7 +1045,6 @@ objects_query_fontnumbers (const std::vector<SPItem*> &objects, SPStyle *style_r bool lineheight_normal = false; bool lineheight_unit_proportional = false; bool lineheight_unit_absolute = false; - bool lineheight_set = false; // Set true if any object has lineheight set. double size_prev = 0; double letterspacing_prev = 0; @@ -1131,9 +1130,6 @@ objects_query_fontnumbers (const std::vector<SPItem*> &objects, SPStyle *style_r lineheight_normal = false; lineheight += lineheight_current * doc_scale; } - if (style->line_height.set) { - lineheight_set = true; - } if ((size_prev != 0 && style->font_size.computed != size_prev) || (letterspacing_prev != 0 && style->letter_spacing.computed != letterspacing_prev) || @@ -1209,9 +1205,6 @@ objects_query_fontnumbers (const std::vector<SPItem*> &objects, SPStyle *style_r } } - // Used by text toolbar unset 'line-height' - style_res->line_height.set = lineheight_set; - if (texts > 1) { if (different || different_lineheight) { return QUERY_STYLE_MULTIPLE_AVERAGED; @@ -1914,7 +1907,7 @@ sp_desktop_query_style_from_list (const std::vector<SPItem*> &list, SPStyle *sty int sp_desktop_query_style(SPDesktop *desktop, SPStyle *style, int property) { - // Used by text tool and in gradient dragging. See connectQueryStyle. + // Used by text tool and in gradient dragging int ret = desktop->_query_style_signal.emit(style, property); if (ret != QUERY_STYLE_NOTHING) |