index a8cdba61e973cfb7129a8e216bd88c04cbfa5e16..d5c4899c67624b3a2b8197a6fd3f77fd8db576a5 100644 (file)
#include "color-picker.h"
+static bool _in_use = false;
+
namespace Inkscape {
namespace UI {
namespace Widget {
g_signal_connect(G_OBJECT(_colorSelector), "dragged",
G_CALLBACK(sp_color_picker_color_mod), (void *)this);
+ g_signal_connect(G_OBJECT(_colorSelector), "released",
+ G_CALLBACK(sp_color_picker_color_mod), (void *)this);
g_signal_connect(G_OBJECT(_colorSelector), "changed",
G_CALLBACK(sp_color_picker_color_mod), (void *)this);
void
ColorPicker::setRgba32 (guint32 rgba)
{
+ if (_in_use) return;
+
_preview.setRgba32 (rgba);
_rgba = rgba;
if (_colorSelector)
void
sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp)
{
+ if (_in_use) return;
+ else _in_use = true;
+
SPColor color;
float alpha;
csel->base->getColorAlpha(color, &alpha);
(ptr->_preview).setRgba32 (rgba);
if (ptr->_undo && SP_ACTIVE_DESKTOP)
- sp_document_done(SP_DT_DOCUMENT(SP_ACTIVE_DESKTOP));
+ sp_document_done(sp_desktop_document(SP_ACTIVE_DESKTOP), SP_VERB_NONE,
+ /* TODO: annotate */ "color-picker.cpp:130");
ptr->on_changed (rgba);
+ _in_use = false;
ptr->_changed_signal.emit (rgba);
+ ptr->_rgba = rgba;
}