From 8f08a6abd400a84ad9461b4517aefb1507d229ed Mon Sep 17 00:00:00 2001 From: John Smith Date: Wed, 5 Sep 2012 13:00:15 +0900 Subject: Fix for 172236 : Dropper in Fill-Stroke dialog, changed to be a one time only pick (bzr r11652) --- src/widgets/sp-color-notebook.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/widgets/sp-color-notebook.cpp') diff --git a/src/widgets/sp-color-notebook.cpp b/src/widgets/sp-color-notebook.cpp index fec34c6e7..bafc75b18 100644 --- a/src/widgets/sp-color-notebook.cpp +++ b/src/widgets/sp-color-notebook.cpp @@ -39,6 +39,7 @@ #include "cms-system.h" #include "widgets/icon.h" #include "tools-switch.h" +#include "event-context.h" using Inkscape::CMSSystem; @@ -511,7 +512,10 @@ void ColorNotebook::_colorChanged() void ColorNotebook::_picker_clicked(GtkWidget *widget, SPColorNotebook *colorbook) { - tools_switch(SP_ACTIVE_DESKTOP, TOOLS_DROPPER); + // Set the dropper into a "one click" mode, so it reverts to the previous tool after a click + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + prefs->setBool("/tools/dropper/onetimepick", true); + sp_toggle_dropper(SP_ACTIVE_DESKTOP); } void ColorNotebook::_rgbaEntryChangedHook(GtkEntry *entry, SPColorNotebook *colorbook) -- cgit v1.2.3