Fix for 171177 : Border in palette swatches

(bzr r11706)

9 files changed, 199 insertions, 69 deletions

diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp
index b0da4aecc..969aac7ab 100644
--- a/src/ui/dialog/color-item.cpp
+++ b/src/ui/dialog/color-item.cpp
@@ -546,7 +546,7 @@ void ColorItem::_regenPreview(EekPreview * preview)
                                                 | (_isLive ? PREVIEW_LINK_OTHER:0)) );
 }
 
-Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewSize size, guint ratio)
+Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewSize size, guint ratio, guint border)
 {
     Gtk::Widget* widget = 0;
     if ( style == PREVIEW_STYLE_BLURB) {
@@ -565,7 +565,7 @@ Gtk::Widget* ColorItem::getPreview(PreviewStyle style, ViewType view, ::PreviewS
 
         _regenPreview(preview);
 
-        eek_preview_set_details( preview, (::PreviewStyle)style, (::ViewType)view, (::PreviewSize)size, ratio );
+        eek_preview_set_details( preview, (::PreviewStyle)style, (::ViewType)view, (::PreviewSize)size, ratio, border );
 
         def.addCallback( _colorDefChanged, this );
 
diff --git a/src/ui/dialog/color-item.h b/src/ui/dialog/color-item.h
index e6f5c7b76..f54586192 100644
--- a/src/ui/dialog/color-item.h
+++ b/src/ui/dialog/color-item.h
@@ -53,7 +53,8 @@ public:
     virtual Gtk::Widget* getPreview(PreviewStyle style,
                                     ViewType view,
                                     ::PreviewSize size,
-                                    guint ratio);
+                                    guint ratio,
+                                    guint border);
     void buttonClicked(bool secondary = false);
 
     void setGradient(SPGradient *grad);
diff --git a/src/ui/previewable.h b/src/ui/previewable.h
index 9a086a9a2..377e109fb 100644
--- a/src/ui/previewable.h
+++ b/src/ui/previewable.h
@@ -35,12 +35,13 @@ typedef enum {
     VIEW_TYPE_GRID
 } ViewType;
 
+
 class Previewable
 {
 public:
 // TODO need to add some nice parameters
     virtual ~Previewable() {}
-    virtual Gtk::Widget* getPreview( PreviewStyle style, ViewType view, ::PreviewSize size, guint ratio ) = 0;
+    virtual Gtk::Widget* getPreview( PreviewStyle style, ViewType view, ::PreviewSize size, guint ratio, guint border) = 0;
 };
 
 
diff --git a/src/ui/previewfillable.h b/src/ui/previewfillable.h
index d5f609a0b..044357503 100644
--- a/src/ui/previewfillable.h
+++ b/src/ui/previewfillable.h
@@ -28,11 +28,12 @@ public:
     virtual void addPreview( Previewable* preview ) = 0;
     virtual void freezeUpdates() = 0;
     virtual void thawUpdates() = 0;
-    virtual void setStyle( ::PreviewSize size, ViewType type, guint ratio) = 0;
+    virtual void setStyle( ::PreviewSize size, ViewType type, guint ratio, ::BorderStyle border ) = 0;
     virtual void setOrientation(SPAnchorType how) = 0;
     virtual ::PreviewSize getPreviewSize() const = 0;
     virtual ViewType getPreviewType() const = 0;
     virtual guint getPreviewRatio() const = 0;
+    virtual ::BorderStyle getPreviewBorder() const = 0;
     virtual void setWrap( bool b ) = 0;
     virtual bool getWrap() const = 0;
 };
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp
index e1c2c718a..0dac18665 100644
--- a/src/ui/previewholder.cpp
+++ b/src/ui/previewholder.cpp
@@ -12,6 +12,7 @@
 
 
 #include "previewholder.h"
+#include "preferences.h"
 
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/sizegroup.h>
@@ -38,7 +39,8 @@ PreviewHolder::PreviewHolder() :
     _baseSize(PREVIEW_SIZE_SMALL),
     _ratio(100),
     _view(VIEW_TYPE_LIST),
-    _wrap(false)
+    _wrap(false),
+    _border(BORDER_NONE)
 {
     _scroller = manage(new Gtk::ScrolledWindow());
     _insides = manage(new Gtk::Table( 1, 2 ));
@@ -77,13 +79,13 @@ void PreviewHolder::addPreview( Previewable* preview )
         int i = items.size() - 1;
 
         if ( _view == VIEW_TYPE_LIST ) {
-            Gtk::Widget* label = manage(preview->getPreview(PREVIEW_STYLE_BLURB, VIEW_TYPE_LIST, _baseSize, _ratio));
-            Gtk::Widget* thing = manage(preview->getPreview(PREVIEW_STYLE_PREVIEW, VIEW_TYPE_LIST, _baseSize, _ratio));
+            Gtk::Widget* label = manage(preview->getPreview(PREVIEW_STYLE_BLURB, VIEW_TYPE_LIST, _baseSize, _ratio, _border));
+            Gtk::Widget* thing = manage(preview->getPreview(PREVIEW_STYLE_PREVIEW, VIEW_TYPE_LIST, _baseSize, _ratio, _border));
 
             _insides->attach( *thing, 0, 1, i, i+1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND );
             _insides->attach( *label, 1, 2, i, i+1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK );
         } else {
-            Gtk::Widget* thing = manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, VIEW_TYPE_GRID, _baseSize, _ratio));
+            Gtk::Widget* thing = manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, VIEW_TYPE_GRID, _baseSize, _ratio, _border));
 
             int width = 1;
             int height = 1;
@@ -129,12 +131,13 @@ void PreviewHolder::thawUpdates()
     rebuildUI();
 }
 
-void PreviewHolder::setStyle( ::PreviewSize size, ViewType view, guint ratio )
+void PreviewHolder::setStyle( ::PreviewSize size, ViewType view, guint ratio, ::BorderStyle border )
 {
-    if ( size != _baseSize || view != _view || ratio != _ratio ) {
+    if ( size != _baseSize || view != _view || ratio != _ratio || border != _border ) {
         _baseSize = size;
         _view = view;
         _ratio = ratio;
+        _border = border;
         // Kludge to restore scrollbars
         if ( !_wrap && (_view != VIEW_TYPE_LIST) && (_anchor == SP_ANCHOR_NORTH || _anchor == SP_ANCHOR_SOUTH) ) {
             dynamic_cast<Gtk::ScrolledWindow*>(_scroller)->set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER );
@@ -304,12 +307,15 @@ void PreviewHolder::rebuildUI()
     if ( _view == VIEW_TYPE_LIST ) {
         _insides = manage(new Gtk::Table( 1, 2 ));
         _insides->set_col_spacings( 8 );
+        if (_border == BORDER_WIDE) {
+            _insides->set_row_spacings( 1 );
+        }
 
         for ( unsigned int i = 0; i < items.size(); i++ ) {
-            Gtk::Widget* label = manage(items[i]->getPreview(PREVIEW_STYLE_BLURB, _view, _baseSize, _ratio));
+            Gtk::Widget* label = manage(items[i]->getPreview(PREVIEW_STYLE_BLURB, _view, _baseSize, _ratio, _border));
             //label->set_alignment(Gtk::ALIGN_LEFT, Gtk::ALIGN_CENTER);
 
-            Gtk::Widget* thing = manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, _view, _baseSize, _ratio));
+            Gtk::Widget* thing = manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, _view, _baseSize, _ratio, _border));
 
             _insides->attach( *thing, 0, 1, i, i+1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND );
             _insides->attach( *label, 1, 2, i, i+1, Gtk::FILL|Gtk::EXPAND, Gtk::SHRINK );
@@ -322,11 +328,18 @@ void PreviewHolder::rebuildUI()
         int height = 1;
 
         for ( unsigned int i = 0; i < items.size(); i++ ) {
-            Gtk::Widget* thing = manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, _view, _baseSize, _ratio));
+
+            // If this is the last row, flag so the previews can draw a bottom
+            ::BorderStyle border = ((row == height -1) && (_border == BORDER_SOLID)) ? BORDER_SOLID_LAST_ROW : _border;
+            Gtk::Widget* thing = manage(items[i]->getPreview(PREVIEW_STYLE_PREVIEW, _view, _baseSize, _ratio, border));
 
             if ( !_insides ) {
                 calcGridSize( thing, items.size(), width, height );
                 _insides = manage(new Gtk::Table( height, width ));
+                if (_border == BORDER_WIDE) {
+                    _insides->set_col_spacings( 1 );
+                    _insides->set_row_spacings( 1 );
+                }
             }
 
             _insides->attach( *thing, col, col+1, row, row+1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND );
diff --git a/src/ui/previewholder.h b/src/ui/previewholder.h
index b7073024e..8363498a6 100644
--- a/src/ui/previewholder.h
+++ b/src/ui/previewholder.h
@@ -33,13 +33,14 @@ public:
     virtual void addPreview( Previewable* preview );
     virtual void freezeUpdates();
     virtual void thawUpdates();
-    virtual void setStyle( ::PreviewSize size, ViewType view, guint ratio );
+    virtual void setStyle( ::PreviewSize size, ViewType view, guint ratio, ::BorderStyle border );
     virtual void setOrientation(SPAnchorType how);
     virtual int getColumnPref() const { return _prefCols; }
     virtual void setColumnPref( int cols );
     virtual ::PreviewSize getPreviewSize() const { return _baseSize; }
     virtual ViewType getPreviewType() const { return _view; }
     virtual guint getPreviewRatio() const { return _ratio; }
+    virtual ::BorderStyle getPreviewBorder() const { return _border; }
     virtual void setWrap( bool b );
     virtual bool getWrap() const { return _wrap; }
 
@@ -62,6 +63,7 @@ private:
     guint _ratio;
     ViewType _view;
     bool _wrap;
+    ::BorderStyle _border;
 };
 
 } //namespace UI
diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp
index a1ae6a36d..1f945ada6 100644
--- a/src/ui/widget/panel.cpp
+++ b/src/ui/widget/panel.cpp
@@ -42,7 +42,8 @@ static const int PANEL_SETTING_SIZE = 0;
 static const int PANEL_SETTING_MODE = 1;
 static const int PANEL_SETTING_SHAPE = 2;
 static const int PANEL_SETTING_WRAP = 3;
-static const int PANEL_SETTING_NEXTFREE = 4;
+static const int PANEL_SETTING_BORDER = 4;
+static const int PANEL_SETTING_NEXTFREE = 5;
 
 
 void Panel::prep() {
@@ -93,7 +94,7 @@ void Panel::_init()
     Glib::ustring tmp("<");
     _anchor = SP_ANCHOR_CENTER;
 
-    guint panel_size = 0, panel_mode = 0, panel_ratio = 100;
+    guint panel_size = 0, panel_mode = 0, panel_ratio = 100, panel_border = 0;
     bool panel_wrap = 0;
     if (!_prefs_path.empty()) {
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -101,6 +102,7 @@ void Panel::_init()
         panel_size = prefs->getIntLimited(_prefs_path + "/panel_size", 1, 0, PREVIEW_SIZE_HUGE);
         panel_mode = prefs->getIntLimited(_prefs_path + "/panel_mode", 1, 0, 10);
         panel_ratio = prefs->getIntLimited(_prefs_path + "/panel_ratio", 100, 0, 500 );
+        panel_border = prefs->getIntLimited(_prefs_path + "/panel_border", BORDER_NONE, 0, 2 );
     }
 
     _menu = new Gtk::Menu();
@@ -198,6 +200,42 @@ void Panel::_init()
     }
 
     {
+        Glib::ustring widthItemLabel(C_("Swatches", "Border"));
+
+        //TRANSLATORS: Indicates border of colour swatches
+        const gchar *widthLabels[] = {
+            NC_("Swatches border", "None"),
+            NC_("Swatches border", "Solid"),
+            NC_("Swatches border", "Wide"),
+        };
+
+        Gtk::MenuItem *item = manage( new Gtk::MenuItem(widthItemLabel));
+        Gtk::Menu *type_menu = manage(new Gtk::Menu());
+        item->set_submenu(*type_menu);
+        _menu->append(*item);
+
+        Gtk::RadioMenuItem::Group widthGroup;
+
+        guint values[] = {0, 1, 2};
+        guint hot_index = 0;
+        for ( guint i = 0; i < G_N_ELEMENTS(widthLabels); ++i ) {
+            // Assume all values are in increasing order
+            if ( values[i] <= panel_border ) {
+                hot_index = i;
+            }
+        }
+        for ( guint i = 0; i < G_N_ELEMENTS(widthLabels); ++i ) {
+            Glib::ustring _label(g_dpgettext2(NULL, "Swatches border", widthLabels[i]));
+            Gtk::RadioMenuItem *_item = manage(new Gtk::RadioMenuItem(widthGroup, _label));
+            type_menu->append(*_item);
+            if ( i <= hot_index ) {
+                _item->set_active(true);
+            }
+            _item->signal_activate().connect(sigc::bind<int, int>(sigc::mem_fun(*this, &Panel::_bounceCall), PANEL_SETTING_BORDER, values[i]));
+        }
+    }
+
+    {
         //TRANSLATORS: "Wrap" indicates how colour swatches are displayed
         Glib::ustring wrap_label(C_("Swatches","Wrap"));
         Gtk::CheckMenuItem *check = manage(new Gtk::CheckMenuItem(wrap_label));
@@ -259,6 +297,7 @@ void Panel::_init()
     _bounceCall(PANEL_SETTING_MODE, panel_mode);
     _bounceCall(PANEL_SETTING_SHAPE, panel_ratio);
     _bounceCall(PANEL_SETTING_WRAP, panel_wrap);
+    _bounceCall(PANEL_SETTING_BORDER, panel_border);
 }
 
 void Panel::setLabel(Glib::ustring const &label)
@@ -323,7 +362,7 @@ void Panel::present()
 
 void Panel::restorePanelPrefs()
 {
-    guint panel_size = 0, panel_mode = 0, panel_ratio = 100;
+    guint panel_size = 0, panel_mode = 0, panel_ratio = 100, panel_border = 0;
     bool panel_wrap = 0;
     if (!_prefs_path.empty()) {
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -331,11 +370,13 @@ void Panel::restorePanelPrefs()
         panel_size = prefs->getIntLimited(_prefs_path + "/panel_size", 1, 0, PREVIEW_SIZE_HUGE);
         panel_mode = prefs->getIntLimited(_prefs_path + "/panel_mode", 1, 0, 10);
         panel_ratio = prefs->getIntLimited(_prefs_path + "/panel_ratio", 000, 0, 500 );
+        panel_border = prefs->getIntLimited(_prefs_path + "/panel_border", BORDER_NONE, 0, 2 );
     }
     _bounceCall(PANEL_SETTING_SIZE, panel_size);
     _bounceCall(PANEL_SETTING_MODE, panel_mode);
     _bounceCall(PANEL_SETTING_SHAPE, panel_ratio);
     _bounceCall(PANEL_SETTING_WRAP, panel_wrap);
+    _bounceCall(PANEL_SETTING_BORDER, panel_border);
 }
 
 sigc::signal<void, int> &Panel::signalResponse()
@@ -360,30 +401,32 @@ void Panel::_bounceCall(int i, int j)
         if (_fillable) {
             ViewType curr_type = _fillable->getPreviewType();
             guint curr_ratio = _fillable->getPreviewRatio();
+            ::BorderStyle curr_border = _fillable->getPreviewBorder();
+
             switch (j) {
             case 0:
             {
-                _fillable->setStyle(::PREVIEW_SIZE_TINY, curr_type, curr_ratio);
+                _fillable->setStyle(::PREVIEW_SIZE_TINY, curr_type, curr_ratio, curr_border);
             }
             break;
             case 1:
             {
-                _fillable->setStyle(::PREVIEW_SIZE_SMALL, curr_type, curr_ratio);
+                _fillable->setStyle(::PREVIEW_SIZE_SMALL, curr_type, curr_ratio, curr_border);
             }
             break;
             case 2:
             {
-                _fillable->setStyle(::PREVIEW_SIZE_MEDIUM, curr_type, curr_ratio);
+                _fillable->setStyle(::PREVIEW_SIZE_MEDIUM, curr_type, curr_ratio, curr_border);
             }
             break;
             case 3:
             {
-                _fillable->setStyle(::PREVIEW_SIZE_BIG, curr_type, curr_ratio);
+                _fillable->setStyle(::PREVIEW_SIZE_BIG, curr_type, curr_ratio, curr_border);
             }
             break;
             case 4:
             {
-                _fillable->setStyle(::PREVIEW_SIZE_HUGE, curr_type, curr_ratio);
+                _fillable->setStyle(::PREVIEW_SIZE_HUGE, curr_type, curr_ratio, curr_border);
             }
             break;
             default:
@@ -399,15 +442,16 @@ void Panel::_bounceCall(int i, int j)
         if (_fillable) {
             ::PreviewSize curr_size = _fillable->getPreviewSize();
             guint curr_ratio = _fillable->getPreviewRatio();
+            ::BorderStyle curr_border = _fillable->getPreviewBorder();
             switch (j) {
             case 0:
             {
-                _fillable->setStyle(curr_size, VIEW_TYPE_LIST, curr_ratio);
+                _fillable->setStyle(curr_size, VIEW_TYPE_LIST, curr_ratio, curr_border);
             }
             break;
             case 1:
             {
-                _fillable->setStyle(curr_size, VIEW_TYPE_GRID, curr_ratio);
+                _fillable->setStyle(curr_size, VIEW_TYPE_GRID, curr_ratio, curr_border);
             }
             break;
             default:
@@ -423,7 +467,40 @@ void Panel::_bounceCall(int i, int j)
         if ( _fillable ) {
             ViewType curr_type = _fillable->getPreviewType();
             ::PreviewSize curr_size = _fillable->getPreviewSize();
-            _fillable->setStyle(curr_size, curr_type, j);
+            ::BorderStyle curr_border = _fillable->getPreviewBorder();
+
+            _fillable->setStyle(curr_size, curr_type, j, curr_border);
+        }
+        break;
+    case PANEL_SETTING_BORDER:
+        if (!_prefs_path.empty()) {
+            Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+            prefs->setInt(_prefs_path + "/panel_border", j);
+        }
+        if ( _fillable ) {
+            ::PreviewSize curr_size = _fillable->getPreviewSize();
+            ViewType curr_type = _fillable->getPreviewType();
+            guint curr_ratio = _fillable->getPreviewRatio();
+
+            switch (j) {
+            case 0:
+            {
+                _fillable->setStyle(curr_size, curr_type, curr_ratio, BORDER_NONE);
+            }
+            break;
+            case 1:
+            {
+                _fillable->setStyle(curr_size, curr_type, curr_ratio, BORDER_SOLID);
+            }
+            break;
+            case 2:
+            {
+                _fillable->setStyle(curr_size, curr_type, curr_ratio, BORDER_WIDE);
+            }
+            break;
+            default:
+                break;
+            }
         }
         break;
     case PANEL_SETTING_WRAP:
diff --git a/src/widgets/eek-preview.cpp b/src/widgets/eek-preview.cpp
index 595c289f2..a0bc1ef15 100644
--- a/src/widgets/eek-preview.cpp
+++ b/src/widgets/eek-preview.cpp
@@ -42,6 +42,7 @@ using std::min;
 
 #include <gtk/gtk.h>
 #include "eek-preview.h"
+#include "preferences.h"
 
 #define PRIME_BUTTON_MAGIC_NUMBER 1
 
@@ -224,13 +225,27 @@ static gboolean eek_preview_expose_event( GtkWidget* widget, GdkEventExpose* /*
 
 static gboolean eek_preview_draw(GtkWidget* widget, cairo_t* cr)
 {
-        GtkStyle* style = gtk_widget_get_style(widget);
-	GtkAllocation allocation;
-	gtk_widget_get_allocation (widget, &allocation);
-        EekPreview* preview = EEK_PREVIEW(widget);
-        GdkColor fg = {0, preview->_r, preview->_g, preview->_b};
-	gint insetX = 0;
-	gint insetY = 0;
+    GtkStyle* style = gtk_widget_get_style(widget);
+    GtkAllocation allocation;
+    gtk_widget_get_allocation(widget, &allocation);
+    EekPreview* preview = EEK_PREVIEW(widget);
+    GdkColor fg = { 0, preview->_r, preview->_g, preview->_b };
+	gint insetTop = 0, insetBottom = 0;
+	gint insetLeft = 0, insetRight = 0;
+
+    if (preview->_border == BORDER_SOLID) {
+        insetTop = 1;
+        insetLeft = 1;
+    }
+    if (preview->_border == BORDER_SOLID_LAST_ROW) {
+        insetTop = insetBottom = 1;
+        insetLeft = 1;
+    }
+    if (preview->_border == BORDER_WIDE) {
+        insetTop = insetBottom = 1;
+        insetLeft = insetRight = 1;
+    }
+
 
 #if GTK_CHECK_VERSION(3,0,0)
         GtkStyleContext *context = gtk_widget_get_style_context(widget);
@@ -247,30 +262,32 @@ static gboolean eek_preview_draw(GtkWidget* widget, cairo_t* cr)
 #else
 	GdkWindow* window = gtk_widget_get_window(widget);
         
-        gtk_paint_flat_box( style,
-                            window,
-                            (GtkStateType)gtk_widget_get_state(widget),
-                            GTK_SHADOW_NONE,
-                            NULL,
-                            widget,
-                            NULL,
-                            0, 0,
-                            allocation.width, allocation.height);
+    gtk_paint_flat_box( style,
+                        window,
+                        (GtkStateType)gtk_widget_get_state(widget),
+                        GTK_SHADOW_NONE,
+                        NULL,
+                        widget,
+                        NULL,
+                        0, 0,
+                        allocation.width, allocation.height);
         
 	gdk_colormap_alloc_color( gdk_colormap_get_system(), &fg, FALSE, TRUE );
 #endif
 
-	GdkRectangle rect = {insetX, 
-		             insetY,
-			     allocation.width - (insetX * 2),
-			     allocation.height - (insetY * 2)};
+	// Border
+	if (preview->_border != BORDER_NONE) {
+        cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
+        cairo_rectangle(cr, 0, 0, allocation.width, allocation.height);
+        cairo_fill(cr);
+	}
 
-	gdk_cairo_set_source_color(cr, &fg);
-	gdk_cairo_rectangle(cr, &rect);
-	cairo_paint(cr);
+    cairo_set_source_rgb(cr, preview->_r/65535.0, preview->_g/65535.0, preview->_b/65535.0 );
+    cairo_rectangle(cr, insetLeft, insetTop, allocation.width - (insetLeft + insetRight), allocation.height - (insetTop + insetBottom));
+    cairo_fill(cr);
 
-        if ( preview->_previewPixbuf ) {
-            GtkDrawingArea *da = &(preview->drawing);
+	if ( preview->_previewPixbuf ) {
+        GtkDrawingArea *da = &(preview->drawing);
 	    GdkWindow *da_window = gtk_widget_get_window(GTK_WIDGET(da));
 	    cairo_t *cr = gdk_cairo_create(da_window);
 
@@ -278,29 +295,38 @@ static gboolean eek_preview_draw(GtkWidget* widget, cairo_t* cr)
 	    gint w = gdk_window_get_width(da_window);
 	    gint h = gdk_window_get_height(da_window);
 #else
-            gint w = 0;
-            gint h = 0;
+        gint w = 0;
+        gint h = 0;
 	    gdk_drawable_get_size(da_window, &w, &h);
 #endif
-            
+
+
 	    if ((w != preview->_scaledW) || (h != preview->_scaledH)) {
-                if (preview->_scaled) {
-                    g_object_unref(preview->_scaled);
-                }
-                preview->_scaled = gdk_pixbuf_scale_simple(preview->_previewPixbuf, w, h, GDK_INTERP_BILINEAR);
-                preview->_scaledW = w;
-                preview->_scaledH = h;
+            if (preview->_scaled) {
+                g_object_unref(preview->_scaled);
             }
+            preview->_scaled = gdk_pixbuf_scale_simple(preview->_previewPixbuf, w - (insetLeft + insetRight), h - (insetTop + insetBottom), GDK_INTERP_BILINEAR);
+            preview->_scaledW = w - (insetLeft + insetRight);
+            preview->_scaledH = h - (insetTop + insetBottom);
+        }
+
+        GdkPixbuf *pix = (preview->_scaled) ? preview->_scaled : preview->_previewPixbuf;
+
+        // Border
+        if (preview->_border != BORDER_NONE) {
+            cairo_set_source_rgb(cr, 0.0, 0.0, 0.0);
+            cairo_rectangle(cr, 0, 0, allocation.width, allocation.height);
+            cairo_fill(cr);
+        }
 
-            GdkPixbuf *pix = (preview->_scaled) ? preview->_scaled : preview->_previewPixbuf;
-	    gdk_cairo_set_source_pixbuf(cr, pix, 0, 0);
+	    gdk_cairo_set_source_pixbuf(cr, pix, insetLeft, insetTop);
 	    cairo_paint(cr);
 	    cairo_destroy(cr);
-        }
+    }
 
         if ( preview->_linked ) {
             /* Draw arrow */
-            GdkRectangle possible = {insetX, insetY, (allocation.width - (insetX * 2)), (allocation.height - (insetY * 2)) };
+            GdkRectangle possible = {insetLeft, insetTop, (allocation.width - (insetLeft + insetRight)), (allocation.height - (insetTop + insetBottom)) };
             GdkRectangle area = {possible.x, possible.y, possible.width / 2, possible.height / 2 };
 
             /* Make it square */
@@ -370,7 +396,7 @@ static gboolean eek_preview_draw(GtkWidget* widget, cairo_t* cr)
             }
 
             if ( preview->_linked & PREVIEW_LINK_OTHER ) {
-                GdkRectangle otherArea = {insetX, area.y, area.width, area.height};
+                GdkRectangle otherArea = {insetLeft, area.y, area.width, area.height};
                 if ( otherArea.height < possible.height ) {
                     otherArea.y = possible.y + (possible.height - otherArea.height) / 2;
                 }
@@ -752,7 +778,7 @@ void eek_preview_set_focus_on_click( EekPreview* preview, gboolean focus_on_clic
     }
 }
 
-void eek_preview_set_details( EekPreview* preview, PreviewStyle prevstyle, ViewType view, PreviewSize size, guint ratio )
+void eek_preview_set_details( EekPreview* preview, PreviewStyle prevstyle, ViewType view, PreviewSize size, guint ratio, guint border )
 {
     preview->_prevstyle = prevstyle;
     preview->_view = view;
@@ -766,7 +792,7 @@ void eek_preview_set_details( EekPreview* preview, PreviewStyle prevstyle, ViewT
         ratio = PREVIEW_MAX_RATIO;
     }
     preview->_ratio = ratio;
-
+    preview->_border = border;
     gtk_widget_queue_draw(GTK_WIDGET(preview));
 }
 
@@ -802,7 +828,7 @@ static void eek_preview_init( EekPreview *preview )
     preview->_view = VIEW_TYPE_LIST;
     preview->_size = PREVIEW_SIZE_SMALL;
     preview->_ratio = 100;
-
+    preview->_border = BORDER_NONE;
     preview->_previewPixbuf = 0;
     preview->_scaled = 0;
 
diff --git a/src/widgets/eek-preview.h b/src/widgets/eek-preview.h
index 7275ab9b4..42e89a161 100644
--- a/src/widgets/eek-preview.h
+++ b/src/widgets/eek-preview.h
@@ -90,6 +90,14 @@ typedef enum {
   PREVIEW_LINK_ALL = 31
 } LinkType;
 
+
+typedef enum {
+    BORDER_NONE = 0,
+    BORDER_SOLID,
+    BORDER_WIDE,
+    BORDER_SOLID_LAST_ROW,
+} BorderStyle;
+
 typedef struct _EekPreview       EekPreview;
 typedef struct _EekPreviewClass  EekPreviewClass;
 
@@ -113,6 +121,7 @@ struct _EekPreview
     PreviewSize _size;
     guint _ratio;
     guint _linked;
+    guint _border;
     GdkPixbuf* _previewPixbuf;
     GdkPixbuf* _scaled;
 };
@@ -128,7 +137,7 @@ struct _EekPreviewClass
 GType      eek_preview_get_type(void) G_GNUC_CONST;
 GtkWidget* eek_preview_new(void);
 
-void eek_preview_set_details( EekPreview* splat, PreviewStyle prevstyle, ViewType view, PreviewSize size, guint ratio );
+void eek_preview_set_details( EekPreview* splat, PreviewStyle prevstyle, ViewType view, PreviewSize size, guint ratio, guint);
 void eek_preview_set_color( EekPreview* splat, int r, int g, int b );
 void eek_preview_set_pixbuf( EekPreview* splat, GdkPixbuf* pixbuf );