diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2007-08-12 07:16:39 +0000 |
|---|---|---|
| committer | nicholasbishop <nicholasbishop@users.sourceforge.net> | 2007-08-12 07:16:39 +0000 |
| commit | 16fca14a4d72fb9a7e3dbc3ceddefd62bf55d4f2 (patch) | |
| tree | afa63e7e0feda214971d3bbdffc423907d12399a /src/ui | |
| parent | revert jasper's way overzealous fix in png-write.cpp rev 13700; new fix in it... (diff) | |
| download | inkscape-16fca14a4d72fb9a7e3dbc3ceddefd62bf55d4f2.tar.gz inkscape-16fca14a4d72fb9a7e3dbc3ceddefd62bf55d4f2.zip | |
Filter effects dialog:
A couple bug fixes; the Link togglebutton for dual spinsliders now updates properly when switching between primitives. Also, the in2 attribute of feDisplacementMap is now properly checked when reordering primitives.
(bzr r3452)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/filter-effects-dialog.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/spin-slider.cpp | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/ui/dialog/filter-effects-dialog.cpp b/src/ui/dialog/filter-effects-dialog.cpp index 3c5a351e6..fe2e8f1c6 100644 --- a/src/ui/dialog/filter-effects-dialog.cpp +++ b/src/ui/dialog/filter-effects-dialog.cpp @@ -1629,6 +1629,10 @@ void check_single_connection(SPFilterPrimitive* prim, const int result) if(SP_FECOMPOSITE(prim)->in2 == result) SP_OBJECT_REPR(prim)->setAttribute("in2", 0); } + else if(SP_IS_FEDISPLACEMENTMAP(prim)) { + if(SP_FEDISPLACEMENTMAP(prim)->in2 == result) + SP_OBJECT_REPR(prim)->setAttribute("in2", 0); + } } } diff --git a/src/ui/widget/spin-slider.cpp b/src/ui/widget/spin-slider.cpp index 8e2cbc026..15cd5ea1b 100644 --- a/src/ui/widget/spin-slider.cpp +++ b/src/ui/widget/spin-slider.cpp @@ -148,6 +148,8 @@ void DualSpinSlider::set_from_attribute(SPObject* o) if(toks[1]) v2 = Glib::Ascii::strtod(toks[1]); + _link.set_active(toks[1] == 0); + _s1.get_adjustment().set_value(v1); _s2.get_adjustment().set_value(v2); |