diff options
| author | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 12:42:10 +0000 |
|---|---|---|
| committer | Eduard Braun <eduard.braun2@gmx.de> | 2017-07-09 12:42:10 +0000 |
| commit | 241554b7ad311b5868ba284c7a4e6a410432b9bd (patch) | |
| tree | 8bf6fed572d27e9b97ca60b90ae1684ba4856eeb /src/desktop-style.cpp | |
| parent | Use .xml when exporting shortcuts by default (diff) | |
| parent | Shortcuts: Fix for 7d248fbba5b0c24d9a24cda8c3f2e79f96395553 (is_user_set was ... (diff) | |
| download | inkscape-241554b7ad311b5868ba284c7a4e6a410432b9bd.tar.gz inkscape-241554b7ad311b5868ba284c7a4e6a410432b9bd.zip | |
Merge branch 'master' into shortcuts
Diffstat (limited to 'src/desktop-style.cpp')
| -rw-r--r-- | src/desktop-style.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index 4c07c76ea..19582c9ee 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -1157,7 +1157,6 @@ objects_query_fontnumbers (const std::vector<SPItem*> &objects, SPStyle *style_r // FIXME: we must detect MULTIPLE_DIFFERENT for these too style_res->text_anchor.computed = style->text_anchor.computed; - style_res->writing_mode.computed = style->writing_mode.computed; } if (texts == 0) @@ -1394,13 +1393,15 @@ objects_query_writing_modes (const std::vector<SPItem*> &objects, SPStyle *style texts ++; if (set && - ( ( style_res->writing_mode.computed != style->writing_mode.computed ) || + ( ( style_res->writing_mode.computed != style->writing_mode.computed ) || + ( style_res->direction.computed != style->direction.computed ) || ( style_res->text_orientation.computed != style->text_orientation.computed ) ) ) { different = true; // different styles } set = true; style_res->writing_mode.computed = style->writing_mode.computed; + style_res->direction.computed = style->direction.computed; style_res->text_orientation.computed = style->text_orientation.computed; } |