summaryrefslogtreecommitdiffstats
path: root/src/widgets/sp-color-notebook.cpp
diff options
context:
space:
mode:
authorJohn Smith <john.smith7545@yahoo.com>2012-09-05 04:00:15 +0000
committerJohn Smith <john.smith7545@yahoo.com>2012-09-05 04:00:15 +0000
commit8f08a6abd400a84ad9461b4517aefb1507d229ed (patch)
tree0431fb2919900ac775f378442850f21d801b516d /src/widgets/sp-color-notebook.cpp
parentFix for 1042602 : Select toolbar, fix for regression when X and Y values are ... (diff)
downloadinkscape-8f08a6abd400a84ad9461b4517aefb1507d229ed.tar.gz
inkscape-8f08a6abd400a84ad9461b4517aefb1507d229ed.zip
Fix for 172236 : Dropper in Fill-Stroke dialog, changed to be a one time only pick
(bzr r11652)
Diffstat (limited to 'src/widgets/sp-color-notebook.cpp')
-rw-r--r--src/widgets/sp-color-notebook.cpp6
1 files changed, 5 insertions, 1 deletions
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)