diff options
| author | Matthew Petroff <matthew@mpetroff.net> | 2013-09-15 19:26:40 +0000 |
|---|---|---|
| committer | Matthew Petroff <matthew@mpetroff.net> | 2013-09-15 19:26:40 +0000 |
| commit | d0f046b0aff8b4404c852990886f9afeca6d5c0f (patch) | |
| tree | 9f03e5af0f2126a7d9cd7a7d11d61b5b99e16a3a /src/ui/widget | |
| parent | Fix document unit change for disconnected connectors. (diff) | |
| parent | Dutch translation update (diff) | |
| download | inkscape-d0f046b0aff8b4404c852990886f9afeca6d5c0f.tar.gz inkscape-d0f046b0aff8b4404c852990886f9afeca6d5c0f.zip | |
Merge from trunk.
(bzr r12475.1.20)
Diffstat (limited to 'src/ui/widget')
| -rw-r--r-- | src/ui/widget/color-preview.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/ui/widget/color-preview.cpp b/src/ui/widget/color-preview.cpp index 4b4a7b738..5bcd16528 100644 --- a/src/ui/widget/color-preview.cpp +++ b/src/ui/widget/color-preview.cpp @@ -73,9 +73,9 @@ ColorPreview::on_expose_event (GdkEventExpose *event) if (get_is_drawable()) { Cairo::RefPtr<Cairo::Context> cr = get_window()->create_cairo_context(); - cr->rectangle(event->area.x, event->area.y, + cr->rectangle(event->area.x, event->area.y, event->area.width, event->area.height); - cr->clip(); + cr->clip(); result = on_draw(cr); } @@ -176,12 +176,7 @@ ColorPreview::toPixbuf (int width, int height) cairo_destroy(ct); cairo_surface_flush(s); - GdkPixbuf* pixbuf = gdk_pixbuf_new_from_data( cairo_image_surface_get_data(s), - GDK_COLORSPACE_RGB, TRUE, 8, - width, height, cairo_image_surface_get_stride(s), - ink_cairo_pixbuf_cleanup, s); - convert_pixbuf_argb32_to_normal(pixbuf); - + GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(s); return pixbuf; } |