summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2d5f454)
raw | patch | inline | side by side (parent: 2d5f454)
author | buliabyak <buliabyak@users.sourceforge.net> | |
Sat, 13 May 2006 21:51:17 +0000 (21:51 +0000) | ||
committer | buliabyak <buliabyak@users.sourceforge.net> | |
Sat, 13 May 2006 21:51:17 +0000 (21:51 +0000) |
src/desktop-style.cpp | patch | blob | history |
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp
index f680988f8768bacb0067d970fd276d6ba0b3dc22..58209aaa3c70d4eb41b440535fd5ae8ec2f7ed9b 100644 (file)
--- a/src/desktop-style.cpp
+++ b/src/desktop-style.cpp
guint32 r = 0; // if there's no color, return black
if (prefs_get_int_attribute(tool, "usecurrent", 0) != 0) {
css = sp_desktop_get_style(desktop, is_fill);
- }
- else {
+ } else {
Inkscape::XML::Node *tool_repr = inkscape_get_repr(INKSCAPE, tool);
css = sp_repr_css_attr_inherited(tool_repr, "style");
- }
+ }
gchar const *property = sp_repr_css_property(css, is_fill ? "fill" : "stroke", "#000");
if (strncmp(property, "url", 3)) { // and if it's not url,
// read it
r = sp_svg_read_color(property, r);
- }
}
+ }
return r | 0xff;
}
/**