diff options
| author | John Smith <john.smith7545@yahoo.com> | 2012-09-27 02:58:05 +0000 |
|---|---|---|
| committer | John Smith <john.smith7545@yahoo.com> | 2012-09-27 02:58:05 +0000 |
| commit | c58c848684c4d1d58e59ca0d8112530bc451175c (patch) | |
| tree | a8e9eceb6396958f8d2806ad9cb1ad5d1c3d6950 /src/ui/dialog | |
| parent | Fix for 169001 : Long layer names mess with the UI (diff) | |
| download | inkscape-c58c848684c4d1d58e59ca0d8112530bc451175c.tar.gz inkscape-c58c848684c4d1d58e59ca0d8112530bc451175c.zip | |
Fix for 171177 : Border in palette swatches
(bzr r11706)
Diffstat (limited to 'src/ui/dialog')
| -rw-r--r-- | src/ui/dialog/color-item.cpp | 4 | ||||
| -rw-r--r-- | src/ui/dialog/color-item.h | 3 |
2 files changed, 4 insertions, 3 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); |