Order disposition of icons

Add inverse also to opacity

(bzr r14422.1.37)

4 files changed, 33 insertions, 29 deletions

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index d9a5de377..f7762ad8a 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -175,7 +175,7 @@ SprayTool::SprayTool()
     , dilate_area(NULL)
     , nooverlap(false)
     , picker(false)
-    , pickinversesize(false)
+    , pickinversevalue(false)
     , pickfill(false)
     , pickstroke(false)
     , visible(false)
@@ -256,7 +256,7 @@ void SprayTool::setup() {
     sp_event_context_read(this, "Scale");
     sp_event_context_read(this, "offset");
     sp_event_context_read(this, "picker");
-    sp_event_context_read(this, "pickinversesize");
+    sp_event_context_read(this, "pickinversevalue");
     sp_event_context_read(this, "pickfill");
     sp_event_context_read(this, "pickstroke");
     sp_event_context_read(this, "visible");
@@ -306,8 +306,8 @@ void SprayTool::set(const Inkscape::Preferences::Entry& val) {
         this->offset = CLAMP(val.getDouble(), -1000.0, 1000.0);
     } else if (path == "picker") {
         this->picker =  val.getBool();
-    } else if (path == "pickinversesize") {
-        this->pickinversesize =  val.getBool();
+    } else if (path == "pickinversevalue") {
+        this->pickinversevalue =  val.getBool();
     } else if (path == "pickfill") {
         this->pickfill =  val.getBool();
     } else if (path == "pickstroke") {
@@ -440,7 +440,7 @@ static bool fit_item(SPDesktop *desktop,
                      double &_scale,
                      double scale,
                      bool picker,
-                     bool pickinversesize,
+                     bool pickinversevalue,
                      bool pickfill,
                      bool pickstroke,
                      bool visible,
@@ -625,7 +625,7 @@ static bool fit_item(SPDesktop *desktop,
             rgba = SP_RGBA32_F_COMPOSE(r, g, b, a);
             if (pick_to_size) {
                 if(!trace_scale){
-                    if(pickinversesize) {
+                    if(pickinversevalue) {
                         _scale = 1.0 - val;
                     } else {
                         _scale = val;
@@ -642,7 +642,7 @@ static bool fit_item(SPDesktop *desktop,
                          _scale,
                          scale,
                          picker,
-                         pickinversesize,
+                         pickinversevalue,
                          pickfill,
                          pickstroke,
                          visible,
@@ -656,7 +656,11 @@ static bool fit_item(SPDesktop *desktop,
             }
 
             if (pick_to_opacity) {
-                opacity *= val;
+                if(pickinversevalue) {
+                    opacity *= 1.0 - val;
+                } else {
+                    opacity *= val;
+                }
                 std::stringstream opacity_str;
                 opacity_str.imbue(std::locale::classic());
                 opacity_str << opacity;
@@ -712,7 +716,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                                gint _distrib,
                                bool nooverlap,
                                bool picker,
-                               bool pickinversesize,
+                               bool pickinversevalue,
                                bool pickfill,
                                bool pickstroke,
                                bool visible,
@@ -757,7 +761,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
                 if(nooverlap || picker || visible){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversesize, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversevalue, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -864,7 +868,7 @@ static bool sp_spray_recursive(SPDesktop *desktop,
                 Geom::Point move = (Geom::Point(cos(tilt)*cos(dp)*dr/(1-ratio)+sin(tilt)*sin(dp)*dr/(1+ratio), -sin(tilt)*cos(dp)*dr/(1-ratio)+cos(tilt)*sin(dp)*dr/(1+ratio)))+(p-a->midpoint());
                 SPCSSAttr *css = sp_repr_css_attr_new();
                 if(nooverlap || picker || visible){
-                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversesize, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
+                    if(!fit_item(desktop, item, a, move, center, angle, _scale, scale, picker, pickinversevalue, pickfill, pickstroke, visible, nooverlap, offset, css, false)){
                         return false;
                     }
                 }
@@ -942,7 +946,7 @@ static bool sp_spray_dilate(SprayTool *tc, Geom::Point /*event_p*/, Geom::Point
         for(std::vector<SPItem*>::const_iterator i=items.begin();i!=items.end();i++){
             SPItem *item = *i;
             g_assert(item != NULL);
-            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickinversesize, tc->pickfill, tc->pickstroke, tc->visible, tc->offset, tc->usepressurescale, get_pressure(tc))) {
+            if (sp_spray_recursive(desktop, selection, item, p, vector, tc->mode, radius, population, tc->scale, tc->scale_variation, reverse, move_mean, move_standard_deviation, tc->ratio, tc->tilt, tc->rotation_variation, tc->distrib, tc->nooverlap, tc->picker, tc->pickinversevalue, tc->pickfill, tc->pickstroke, tc->visible, tc->offset, tc->usepressurescale, get_pressure(tc))) {
                 did = true;
             }
         }
diff --git a/src/ui/tools/spray-tool.h b/src/ui/tools/spray-tool.h
index 212948c77..ca0c20375 100644
--- a/src/ui/tools/spray-tool.h
+++ b/src/ui/tools/spray-tool.h
@@ -91,7 +91,7 @@ public:
     SPCanvasItem *dilate_area;
     bool nooverlap;
     bool picker;
-    bool pickinversesize;
+    bool pickinversevalue;
     bool pickfill;
     bool pickstroke;
     bool visible;
diff --git a/src/widgets/spray-toolbar.cpp b/src/widgets/spray-toolbar.cpp
index c7013b6a1..fa9722bdb 100644
--- a/src/widgets/spray-toolbar.cpp
+++ b/src/widgets/spray-toolbar.cpp
@@ -71,7 +71,7 @@ static void sp_stb_sensitivize( GObject *tbl )
     GtkToggleAction *usepressurescale = GTK_TOGGLE_ACTION( g_object_get_data(tbl, "usepressurescale") );
     GtkAction *pickfill = GTK_ACTION( g_object_get_data(tbl, "pickfill") );
     GtkAction *pickstroke = GTK_ACTION( g_object_get_data(tbl, "pickstroke") );
-    GtkAction *pickinversesize = GTK_ACTION( g_object_get_data(tbl, "pickinversesize") );
+    GtkAction *pickinversevalue = GTK_ACTION( g_object_get_data(tbl, "pickinversevalue") );
     gtk_adjustment_set_value( adj_offset, 100.0 );
     if (gtk_toggle_action_get_active(nooverlap)) {
         gtk_action_set_sensitive( offset, TRUE );
@@ -87,11 +87,11 @@ static void sp_stb_sensitivize( GObject *tbl )
     if(gtk_toggle_action_get_active(picker)){
         gtk_action_set_sensitive( pickfill, TRUE );
         gtk_action_set_sensitive( pickstroke, TRUE );
-        gtk_action_set_sensitive( pickinversesize, TRUE );
+        gtk_action_set_sensitive( pickinversevalue, TRUE );
     } else {
         gtk_action_set_sensitive( pickfill, FALSE );
         gtk_action_set_sensitive( pickstroke, FALSE );
-        gtk_action_set_sensitive( pickinversesize, FALSE );
+        gtk_action_set_sensitive( pickinversevalue, FALSE );
     }
 }
 
@@ -217,11 +217,11 @@ static void sp_toggle_pick_fill( GtkToggleAction* act, gpointer data )
     prefs->setBool("/tools/spray/pickfill", active);
 }
 
-static void sp_toggle_pick_inverse_size( GtkToggleAction* act, gpointer data )
+static void sp_toggle_pick_inverse_value( GtkToggleAction* act, gpointer data )
 {
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     gboolean active = gtk_toggle_action_get_active(act);
-    prefs->setBool("/tools/spray/pickinversesize", active);
+    prefs->setBool("/tools/spray/pickinversevalue", active);
 }
 
 static void sp_toggle_pick_stroke( GtkToggleAction* act, gpointer data )
@@ -436,14 +436,14 @@ void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObj
 
     /* Inverse Value Size */
     {
-        InkToggleAction* act = ink_toggle_action_new( "SprayOverPickInverseSizeAction",
-                                                      _("Apply inversed to pick value size"),
-                                                      _("Apply inversed to pick value size"),
+        InkToggleAction* act = ink_toggle_action_new( "SprayOverPickInverseValueAction",
+                                                      _("Inversed pick value retaining color"),
+                                                      _("Inversed pick value retaining color"),
                                                       INKSCAPE_ICON("object-tweak-shrink"),
                                                       secondarySize );
-        gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/spray/pickinversesize", false) );
-        g_object_set_data( holder, "pickinversesize", act );
-        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toggle_pick_inverse_size), holder) ;
+        gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(act), prefs->getBool("/tools/spray/pickinversevalue", false) );
+        g_object_set_data( holder, "pickinversevalue", act );
+        g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_toggle_pick_inverse_value), holder) ;
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
     }
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 6457b7c7e..bab317f16 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -321,14 +321,14 @@ static gchar const * ui_descr =
         "    <toolitem action='SprayStandard_deviationAction' />"
         "    <toolitem action='SprayMeanAction' />"
         "    <separator />"
-        "    <toolitem action='SprayPickColorAction' />"
-        "    <toolitem action='SprayOverPickInverseSizeAction' />"
-        "    <toolitem action='SprayOverPickFillAction' />"
-        "    <toolitem action='SprayOverPickStrokeAction' />"
-        "    <separator />"
         "    <toolitem action='SprayOverVisibleAction' />"
         "    <toolitem action='SprayNoOverlapAction' />"
         "    <toolitem action='SprayToolOffsetAction' />"
+        "    <separator />"
+        "    <toolitem action='SprayPickColorAction' />"
+        "    <toolitem action='SprayOverPickInverseValueAction' />"
+        "    <toolitem action='SprayOverPickFillAction' />"
+        "    <toolitem action='SprayOverPickStrokeAction' />"
         
         "  </toolbar>"