From abe296168df89e7f62e9d670602ffea62ad78a22 Mon Sep 17 00:00:00 2001
From: Raphael Rosch <launchpad@insaner.com>
Date: Mon, 4 May 2015 12:17:58 -0400
Subject: going from swatch to flat color should start with previous swatch
 color

Fixed bugs:
  - https://launchpad.net/bugs/1450112

(bzr r14109)
---
 src/widgets/paint-selector.cpp | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 740ce2b0e..221344296 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -35,6 +35,7 @@
 #include "sp-linear-gradient.h"
 #include "sp-radial-gradient.h"
 #include "sp-mesh.h"
+#include "sp-stop.h"
 /* fixme: Move it from dialogs to here */
 #include "gradient-selector.h"
 #include <inkscape.h>
@@ -658,6 +659,20 @@ sp_paint_selector_color_changed(SPColorSelector *csel, SPPaintSelector *psel)
 static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelector::Mode /*mode*/)
 {
     GtkWidget *csel;
+    
+    SPColor newcolor = psel->color;
+    float newalpha = psel->alpha;
+    
+    if ((psel->mode == SPPaintSelector::MODE_SWATCH) 
+            || (psel->mode == SPPaintSelector::MODE_GRADIENT_LINEAR)
+            || (psel->mode == SPPaintSelector::MODE_GRADIENT_RADIAL) ) {
+        SPGradientSelector *gsel = getGradientFromData(psel);
+        if (gsel) {
+            SPGradient *gradient = gsel->getVector();
+            newcolor = gradient->getFirstStop()->specified_color;
+            newalpha = gradient->getFirstStop()->opacity;
+        }
+    }
 
     sp_paint_selector_set_style_buttons(psel, psel->solid);
     gtk_widget_set_sensitive(psel->style, TRUE);
@@ -693,8 +708,7 @@ static void sp_paint_selector_set_mode_color(SPPaintSelector *psel, SPPaintSelec
         psel->selector = vb;
 
         /* Set color */
-        SP_COLOR_SELECTOR( csel )->base->setColorAlpha( psel->color, psel->alpha );
-
+        SP_COLOR_SELECTOR( csel )->base->setColorAlpha( newcolor, newalpha );
     }
 
     gtk_label_set_markup(GTK_LABEL(psel->label), _("<b>Flat color</b>"));
-- 
cgit v1.2.3


From 48e0423afcb02fe4a0f705d828a0dbdb3106b397 Mon Sep 17 00:00:00 2001
From: Marc Jeanmougin <marc@jeanmougin.fr>
Date: Fri, 8 May 2015 15:46:25 +0200
Subject: fixes a few of jenkins warnings

(bzr r14126)
---
 src/widgets/desktop-widget.cpp        | 4 +++-
 src/widgets/ege-adjustment-action.cpp | 2 +-
 src/widgets/gradient-vector.cpp       | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/widgets')

diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index fd3756220..e19f56e48 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -1433,8 +1433,10 @@ sp_desktop_widget_maximize(SPDesktopWidget *dtw)
             if (!dtw->desktop->is_iconified() && !dtw->desktop->is_fullscreen())
             {
                 Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-                gint w, h, x, y;
+                gint w = -1;
+                gint h, x, y;
                 dtw->getWindowGeometry(x, y, w, h);
+                g_assert(w != -1);
                 prefs->setInt("/desktop/geometry/width", w);
                 prefs->setInt("/desktop/geometry/height", h);
                 prefs->setInt("/desktop/geometry/x", x);
diff --git a/src/widgets/ege-adjustment-action.cpp b/src/widgets/ege-adjustment-action.cpp
index d89a6e3f1..a91149f4c 100644
--- a/src/widgets/ege-adjustment-action.cpp
+++ b/src/widgets/ege-adjustment-action.cpp
@@ -742,7 +742,7 @@ static GtkWidget* create_popup_number_menu( EgeAdjustmentAction* act )
 
     if ( act->private_data->descriptions ) {
         gdouble value = ((EgeAdjustmentDescr*)act->private_data->descriptions->data)->value;
-        addOns = flush_explicit_items( addOns, G_CALLBACK(process_menu_action), BUMP_CUSTOM, menu, act, &single, &group, value );
+        flush_explicit_items( addOns, G_CALLBACK(process_menu_action), BUMP_CUSTOM, menu, act, &single, &group, value );
     }
 
     return menu;
diff --git a/src/widgets/gradient-vector.cpp b/src/widgets/gradient-vector.cpp
index d2c46ffec..10d1cc107 100644
--- a/src/widgets/gradient-vector.cpp
+++ b/src/widgets/gradient-vector.cpp
@@ -548,6 +548,7 @@ static void verify_grad(SPGradient *gradient)
         child->setAttribute("style", os.str().c_str());
         gradient->getRepr()->addChild(child, NULL);
         Inkscape::GC::release(child);
+        return;
     }
     if (i < 2) {
         sp_repr_set_css_double(stop->getRepr(), "offset", 0.0);
-- 
cgit v1.2.3