diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-10-14 19:31:25 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2019-10-14 19:31:25 +0000 |
| commit | 412d8a372004dc294c7b79552ee918e46d29f1ba (patch) | |
| tree | 9fa17ef5c8e7761603825239d3b3fae9cb22a840 | |
| parent | Fix a extra blend enum (diff) | |
| download | inkscape-412d8a372004dc294c7b79552ee918e46d29f1ba.tar.gz inkscape-412d8a372004dc294c7b79552ee918e46d29f1ba.zip | |
Fix a bug in previous commit
| -rw-r--r-- | src/ui/widget/filter-effect-chooser.cpp | 8 | ||||
| -rw-r--r-- | src/ui/widget/filter-effect-chooser.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/ui/widget/filter-effect-chooser.cpp b/src/ui/widget/filter-effect-chooser.cpp index f8ebdf915..98074d354 100644 --- a/src/ui/widget/filter-effect-chooser.cpp +++ b/src/ui/widget/filter-effect-chooser.cpp @@ -22,7 +22,7 @@ using Inkscape::Util::EnumDataConverter; namespace Inkscape { -const EnumData<Inkscape::SPBlendMode> SPBlendModeData[SP_CSS_BLEND_ENDMODE] = { +const EnumData<SPBlendMode> SPBlendModeData[SP_CSS_BLEND_ENDMODE] = { { SP_CSS_BLEND_NORMAL, _("Normal"), "normal" }, { SP_CSS_BLEND_MULTIPLY, _("Multiply"), "multiply" }, { SP_CSS_BLEND_SCREEN, _("Screen"), "screen" }, @@ -42,10 +42,10 @@ const EnumData<Inkscape::SPBlendMode> SPBlendModeData[SP_CSS_BLEND_ENDMODE] = { { SP_CSS_BLEND_LUMINOSITY, _("Luminosity"), "luminosity" } }; #ifdef WITH_CSSBLEND -const EnumDataConverter<Inkscape::SPBlendMode> SPBlendModeConverter(SPBlendModeData, SP_CSS_BLEND_ENDMODE); +const EnumDataConverter<SPBlendMode> SPBlendModeConverter(SPBlendModeData, SP_CSS_BLEND_ENDMODE); #else // Disable new blend modes in GUI until widely implemented. -const EnumDataConverter<Inkscape::SPBlendMode> SPBlendModeConverter(SPBlendModeData, SP_CSS_BLEND_LUMINOSITY); +const EnumDataConverter<SPBlendMode> SPBlendModeConverter(SPBlendModeData, SP_CSS_BLEND_LUMINOSITY); #endif namespace UI { @@ -109,7 +109,7 @@ sigc::signal<void>& SimpleFilterModifier::signal_opacity_changed() const Glib::ustring SimpleFilterModifier::get_blend_mode() { - const Util::EnumData<Inkscape::SPBlendMode> *d = _blend.get_active_data(); + const Util::EnumData<SPBlendMode> *d = _blend.get_active_data(); if (d) { return _blend.get_active_data()->key; } else diff --git a/src/ui/widget/filter-effect-chooser.h b/src/ui/widget/filter-effect-chooser.h index 7752d2005..9d5953739 100644 --- a/src/ui/widget/filter-effect-chooser.h +++ b/src/ui/widget/filter-effect-chooser.h @@ -60,7 +60,7 @@ private: Gtk::HBox _hb_blend; Gtk::Label _lb_blend; - ComboBoxEnum<Inkscape::SPBlendMode> _blend; + ComboBoxEnum<SPBlendMode> _blend; SpinScale _blur; SpinScale _opacity; |