From 3f649ca279f98542e8147e9bd5ab67691c6e21a0 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 24 Sep 2014 21:22:34 +0200 Subject: Fix bug in object dialog, in highlight color couldent select opacity, now fixed (bzr r13341.1.224) --- src/sp-item.cpp | 4 ++-- src/ui/dialog/objects.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sp-item.cpp b/src/sp-item.cpp index c3cbe531f..10dc1a32c 100644 --- a/src/sp-item.cpp +++ b/src/sp-item.cpp @@ -188,7 +188,7 @@ bool SPItem::isHighlightSet() const { guint32 SPItem::highlight_color() const { if (_highlightColor) { - return atoi(_highlightColor) | 0x000000ff; + return atoi(_highlightColor) | 0x00000000; } else if (parent && parent != this && SP_IS_ITEM(parent)) { @@ -197,7 +197,7 @@ guint32 SPItem::highlight_color() const { else { static Inkscape::Preferences *prefs = Inkscape::Preferences::get(); - return prefs->getInt("/tools/nodes/highlight_color", 0xff0000ff) | 0x000000ff; + return prefs->getInt("/tools/nodes/highlight_color", 0xff0000ff) | 0x00000000; } } diff --git a/src/ui/dialog/objects.cpp b/src/ui/dialog/objects.cpp index ecd4ff42f..07a27c96e 100644 --- a/src/ui/dialog/objects.cpp +++ b/src/ui/dialog/objects.cpp @@ -1450,7 +1450,7 @@ void sp_highlight_picker_color_mod(SPColorSelector *csel, GObject * cp) guint32 rgba = color.toRGBA32( alpha ); ObjectsPanel *ptr = reinterpret_cast(cp); - + //Set the highlight color for all items in the _highlight_target (all selected items) for (std::vector::iterator iter = ptr->_highlight_target.begin(); iter != ptr->_highlight_target.end(); ++iter) { -- cgit v1.2.3