From ba4dbfb351180e0fc4ad57be6e3534fa2ab5cf8c Mon Sep 17 00:00:00 2001
From: Alex Valavanis <valavanisalex@gmail.com>
Date: Tue, 28 Apr 2015 00:38:31 +0100
Subject: Fix unnecessary inclusion of glibmm/threads.h.  This can be resolved
 by ensuring that glibmm headers always preceed glib.h headers. Same applies
 with gtkmm/gtk+ etc

(bzr r14064)
---
 src/widgets/paint-selector.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'src/widgets/paint-selector.cpp')

diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 948c80db3..740ce2b0e 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -24,10 +24,6 @@
 #include <cstring>
 #include <string>
 
-#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H
-#include <glibmm/threads.h>
-#endif
-
 #include "widgets/swatch-selector.h"
 #include "sp-pattern.h"
 #include <glibmm/i18n.h>
-- 
cgit v1.2.3


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/paint-selector.cpp')

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