diff options
| author | bulia byak <buliabyak@gmail.com> | 2006-05-13 21:51:17 +0000 |
|---|---|---|
| committer | buliabyak <buliabyak@users.sourceforge.net> | 2006-05-13 21:51:17 +0000 |
| commit | d04aacc1acb55033b921966aace76b29bfa61336 (patch) | |
| tree | 68d35ee3859876c7d9fedfde7ed5fc01d5e1a42a /src/desktop-style.cpp | |
| parent | Calligraphy tool now draws in the last used color or tool style depending on ... (diff) | |
| download | inkscape-d04aacc1acb55033b921966aace76b29bfa61336.tar.gz inkscape-d04aacc1acb55033b921966aace76b29bfa61336.zip | |
indentation
(bzr r824)
Diffstat (limited to 'src/desktop-style.cpp')
| -rw-r--r-- | src/desktop-style.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/desktop-style.cpp b/src/desktop-style.cpp index f680988f8..58209aaa3 100644 --- a/src/desktop-style.cpp +++ b/src/desktop-style.cpp @@ -225,11 +225,10 @@ sp_desktop_get_color_tool(SPDesktop *desktop, char const *tool, bool is_fill) 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"); @@ -237,8 +236,8 @@ sp_desktop_get_color_tool(SPDesktop *desktop, char const *tool, bool is_fill) if (strncmp(property, "url", 3)) { // and if it's not url, // read it r = sp_svg_read_color(property, r); - } } + } return r | 0xff; } /** |