Added rought preview of gradients in swatches.

diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 4e15d26ac50ee59a451310f3c4918cfdc30cdcfb..b0f7dd1cb26ab5226dfd31b26c2d92915908de9d 100644 (file)
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -43,6 +43,7 @@
 #include "swatches.h"
 #include "widgets/gradient-vector.h"
 #include "widgets/eek-preview.h"
+#include "display/nr-plain-stuff.h"
 
 namespace Inkscape {
 namespace UI {
@@ -170,6 +171,8 @@ static std::vector<JustForNow*> possible;
 static std::vector<std::string> mimeStrings;
 static std::map<std::string, guint> mimeToInt;
 
+static std::map<ColorItem*, guchar*> previewMap;
+
 void ColorItem::_dragGetColorData( GtkWidget */*widget*/,
                                    GdkDragContext */*drag_context*/,
                                    GtkSelectionData *data,
@@ -608,7 +611,21 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewS
         EekPreview * preview = EEK_PREVIEW(eekWidget);
         Gtk::Widget* newBlot = Glib::wrap(eekWidget);
 
-        eek_preview_set_color( preview, (def.getR() << 8) | def.getR(), (def.getG() << 8) | def.getG(), (def.getB() << 8) | def.getB());
+        if ( previewMap.find(this) == previewMap.end() ){
+            eek_preview_set_color( preview, (def.getR() << 8) | def.getR(),
+                                   (def.getG() << 8) | def.getG(),
+                                   (def.getB() << 8) | def.getB());
+        } else {
+            guchar* px = previewMap[this];
+            int width = 128;
+            int height = 16;
+            GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data( px, GDK_COLORSPACE_RGB, FALSE, 8, 
+                                                          width, height, width * 3,
+                                                          0, // add delete function
+                                                          0
+                );
+            eek_preview_set_pixbuf( preview, pixbuf );
+        }
         if ( def.getType() != ege::PaintDef::RGB ) {
             using Inkscape::IO::Resource::get_path;
             using Inkscape::IO::Resource::ICONS;
@@ -1320,15 +1337,44 @@ void SwatchesPanel::handleGradientsChange()
                     sp_gradient_ensure_vector( grad );
                     SPGradientStop first = grad->vector.stops[0];
                     SPColor color = first.color;
-                    guint32 together = color.toRGBA32(0);
-
-                    Glib::ustring name( grad->id );
-                    unsigned int r = SP_RGBA32_R_U(together);
-                    unsigned int g = SP_RGBA32_G_U(together);
-                    unsigned int b = SP_RGBA32_B_U(together);
-                    ColorItem* item = new ColorItem( r, g, b, name );
-                    item->ptr = this;
-                    docPalette->_colors.push_back(item);
+                    guint32 together = color.toRGBA32(first.opacity);
+
+                    // At the moment we can't trust the count of 1 vs 2 stops.
+                    SPGradientStop second = (*it)->vector.stops[1];
+                    SPColor color2 = second.color;
+                    guint32 together2 = color2.toRGBA32(second.opacity);
+
+                    if ( (grad->vector.stops.size() <= 2) && (together == together2) ) {
+                        // Treat as solid-color
+                        Glib::ustring name( grad->id );
+                        unsigned int r = SP_RGBA32_R_U(together);
+                        unsigned int g = SP_RGBA32_G_U(together);
+                        unsigned int b = SP_RGBA32_B_U(together);
+                        ColorItem* item = new ColorItem( r, g, b, name );
+                        item->ptr = this;
+                        docPalette->_colors.push_back(item);
+                    } else {
+                        // Treat as gradient
+                        Glib::ustring name( grad->id );
+                        unsigned int r = SP_RGBA32_R_U(together);
+                        unsigned int g = SP_RGBA32_G_U(together);
+                        unsigned int b = SP_RGBA32_B_U(together);
+                        ColorItem* item = new ColorItem( r, g, b, name );
+                        item->ptr = this;
+                        docPalette->_colors.push_back(item);
+
+#define VBLOCK 16
+                        gint width = 128;
+                        gint height = VBLOCK;
+                        guchar* px = g_new( guchar, 3 * height * width );
+                        nr_render_checkerboard_rgb( px, width, VBLOCK, 3 * width, 0, 0 );
+                        
+                        sp_gradient_render_vector_block_rgb( grad,
+                                                             px, width, height, 3 * width,
+                                                             0, width, TRUE );
+
+                        previewMap[item] = px;
+                    }
                 }
             }
         }

diff --git a/src/ui/dialog/swatches.h b/src/ui/dialog/swatches.h
index 13029840a450e6880ad3893f26551e3378887a32..7c3288cf1736fe6ccd1a0db6eaee6ea3c1358498 100644 (file)
--- a/src/ui/dialog/swatches.h
+++ b/src/ui/dialog/swatches.h
@@ -24,7 +24,7 @@ namespace Dialogs {
 class ColorItem;
 
 /**
- * A panel that displays color swatches.
+ * A panel that displays paint swatches.
  */
 class SwatchesPanel : public Inkscape::UI::Widget::Panel
 {