diff options
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/filter-effect-chooser.cpp | 8 | ||||
| -rw-r--r-- | src/ui/widget/filter-effect-chooser.h | 8 | ||||
| -rw-r--r-- | src/ui/widget/object-composite-settings.cpp | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp index d0442bddd..a3e2368f1 100644 --- a/src/ui/widget/filter-effect-chooser.cpp +++ b/src/ui/widget/filter-effect-chooser.cpp @@ -142,18 +142,18 @@ sigc::signal<void>& SimpleFilterModifier::signal_opacity_changed() return _signal_opacity_changed; } -int SimpleFilterModifier::get_isolation_mode() +SPIsolation SimpleFilterModifier::get_isolation_mode() { return _isolation.get_active() ? SP_CSS_ISOLATION_ISOLATE : SP_CSS_ISOLATION_AUTO; } -void SimpleFilterModifier::set_isolation_mode(const int val, bool notify) +void SimpleFilterModifier::set_isolation_mode(const SPIsolation val, bool notify) { _notify = notify; _isolation.set_active(val == SP_CSS_ISOLATION_ISOLATE); } -int SimpleFilterModifier::get_blend_mode() +SPBlendMode SimpleFilterModifier::get_blend_mode() { const Util::EnumData<SPBlendMode> *d = _blend.get_active_data(); if (d) { @@ -163,7 +163,7 @@ int SimpleFilterModifier::get_blend_mode() } } -void SimpleFilterModifier::set_blend_mode(const int val, bool notify) +void SimpleFilterModifier::set_blend_mode(const SPBlendMode val, bool notify) { _notify = notify; _blend.set_active(val); diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h index 1892ba463..c19303e95 100644 --- a/src/ui/widget/filter-effect-chooser.h +++ b/src/ui/widget/filter-effect-chooser.h @@ -42,11 +42,11 @@ public: sigc::signal<void> &signal_opacity_changed(); sigc::signal<void> &signal_isolation_changed(); - int get_isolation_mode(); - void set_isolation_mode(const int, bool notify); + SPIsolation get_isolation_mode(); + void set_isolation_mode(const SPIsolation, bool notify); - int get_blend_mode(); - void set_blend_mode(const int, bool notify); + SPBlendMode get_blend_mode(); + void set_blend_mode(const SPBlendMode, bool notify); double get_blur_value() const; void set_blur_value(const double); diff --git a/src/ui/widget/object-composite-settings.cpp b/src/ui/widget/object-composite-settings.cpp index 974c46b18..d628870e2 100644 --- a/src/ui/widget/object-composite-settings.cpp +++ b/src/ui/widget/object-composite-settings.cpp @@ -259,14 +259,14 @@ ObjectCompositeSettings::_subjectChanged() { const int blend_result = _subject->queryStyle(&query, QUERY_STYLE_PROPERTY_BLEND); switch(blend_result) { case QUERY_STYLE_NOTHING: - _filter_modifier.set_blend_mode(0, false); + _filter_modifier.set_blend_mode(SP_CSS_BLEND_NORMAL, false); break; case QUERY_STYLE_SINGLE: case QUERY_STYLE_MULTIPLE_SAME: _filter_modifier.set_blend_mode(query.mix_blend_mode.value, true); // here dont work mix_blend_mode.set break; case QUERY_STYLE_MULTIPLE_DIFFERENT: - _filter_modifier.set_blend_mode(0, false); + _filter_modifier.set_blend_mode(SP_CSS_BLEND_NORMAL, false); break; } |
