From 441fc40cb3111c840cdad1ae986af72140d793ec Mon Sep 17 00:00:00 2001 From: Tavmjong Bah Date: Tue, 19 Dec 2017 13:35:32 +0100 Subject: Enable SimpleFilterModifier to handle blend and blur filter primitives at the same time. Add opacity to SimpleFilterModifier. Use SimpleFilterModifier in Layers, Objects, and Fill and Stroke dialogs. --- src/ui/dialog/layers.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/ui/dialog/layers.cpp') diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index 6223bd627..5bbf4c952 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -799,7 +799,10 @@ LayersPanel::LayersPanel() : _model(0), _pending(0), _toggleEvent(0), - _compositeSettings(SP_VERB_DIALOG_LAYERS, "layers", UI::Widget::SimpleFilterModifier::BLEND), + _compositeSettings(SP_VERB_DIALOG_LAYERS, "layers", + UI::Widget::SimpleFilterModifier::BLEND | + UI::Widget::SimpleFilterModifier::OPACITY | + UI::Widget::SimpleFilterModifier::BLUR), desktopChangeConn() { Inkscape::Preferences *prefs = Inkscape::Preferences::get(); -- cgit v1.2.3 From 8e2119c2042debcf51998631e64809e627b148c2 Mon Sep 17 00:00:00 2001 From: Alexander Valavanis Date: Mon, 25 Dec 2017 17:16:41 +0000 Subject: Use a macro for GtkMM version checks --- src/ui/dialog/layers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ui/dialog/layers.cpp') diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index 5bbf4c952..ed2babf80 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -151,7 +151,7 @@ Gtk::MenuItem& LayersPanel::_addPopupItem( SPDesktop *desktop, unsigned int code } Gtk::Label *menu_label = Gtk::manage(new Gtk::Label(label, true)); -#if WITH_GTKMM_3_16 +#if GTKMM_CHECK_VERSION(3,16,0) menu_label->set_xalign(0.0); #else menu_label->set_alignment(0.0, 0.5); -- cgit v1.2.3