diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-10-20 21:51:17 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-10-20 21:51:17 +0000 |
| commit | c600fbef1f09a29fd7ae8f660ab2d12dff2fa1b3 (patch) | |
| tree | 42fc9a2082d29377cff595a9673fe93bdfda125d /src/ui/widget/object-composite-settings.cpp | |
| parent | Update inkscape.pot (diff) | |
| download | inkscape-c600fbef1f09a29fd7ae8f660ab2d12dff2fa1b3.tar.gz inkscape-c600fbef1f09a29fd7ae8f660ab2d12dff2fa1b3.zip | |
Improvements to blending and tooltip
Diffstat (limited to 'src/ui/widget/object-composite-settings.cpp')
| -rw-r--r-- | src/ui/widget/object-composite-settings.cpp | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index 785cb589a..974c46b18 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -114,7 +114,11 @@ ObjectCompositeSettings::_blendBlurValueChanged() SPStyle *style = item->style; g_assert(style != nullptr); item->style->mix_blend_mode.set = TRUE; - item->style->mix_blend_mode.value = _filter_modifier.get_blend_mode(); + if (item->style->isolation.value == SP_CSS_ISOLATION_ISOLATE) { + item->style->mix_blend_mode.value = SP_CSS_BLEND_NORMAL; + } else { + item->style->mix_blend_mode.value = _filter_modifier.get_blend_mode(); + } item->updateRepr(SP_OBJECT_WRITE_NO_CHILDREN | SP_OBJECT_WRITE_EXT); if (radius == 0 && item->style->filter.set @@ -193,6 +197,10 @@ void ObjectCompositeSettings::_isolationValueChanged() for (auto item : _subject->list()) { item->style->isolation.set = TRUE; item->style->isolation.value = _filter_modifier.get_isolation_mode(); + if (item->style->isolation.value == SP_CSS_ISOLATION_ISOLATE) { + item->style->mix_blend_mode.set = TRUE; + item->style->mix_blend_mode.value = SP_CSS_BLEND_NORMAL; + } item->updateRepr(SP_OBJECT_WRITE_NO_CHILDREN | SP_OBJECT_WRITE_EXT); } |