Fixes for transient dialogs in win32.

[inkscape.git] / src / ui / widget / color-picker.cpp

diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index f79334e317d293d94c87bce0ca409d825ac58177..7d7dc9117c32092e1bdbb3c5e20c51b981ac2ee5 100644 (file)
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -16,6 +16,7 @@
 #include "inkscape.h"
 #include "desktop-handles.h"
 #include "document.h"
+#include "dialogs/dialog-events.h"
 
 #include "widgets/sp-color-notebook.h"
 
@@ -50,6 +51,9 @@ ColorPicker::~ColorPicker()
 void
 ColorPicker::setupDialog(const Glib::ustring &title)
 {
+    GtkWidget *dlg = GTK_WIDGET(_colorSelectorDialog.gobj());
+    sp_transientize(dlg);
+
     _colorSelectorDialog.hide();
     _colorSelectorDialog.set_title (title);
     _colorSelectorDialog.set_border_width (4);
@@ -126,7 +130,8 @@ sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp)
     (ptr->_preview).setRgba32 (rgba);
 
     if (ptr->_undo && SP_ACTIVE_DESKTOP)
-        sp_document_done(sp_desktop_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;