From 556072e9949f63461d8936bf47f882e69800285c Mon Sep 17 00:00:00 2001 From: Rob Kendrick Date: Sat, 25 Mar 2006 23:53:34 +0000 Subject: [project @ 2006-03-25 23:53:34 by rjek] Misc GTK thumbnailing fixes svn path=/import/netsurf/; revision=2167 --- gtk/gtk_plotters.c | 3 --- gtk/gtk_thumbnail.c | 5 ++++- gtk/gtk_window.h | 2 +- makefile | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/gtk_plotters.c b/gtk/gtk_plotters.c index ad761194f..7e0c6bd06 100644 --- a/gtk/gtk_plotters.c +++ b/gtk/gtk_plotters.c @@ -40,12 +40,9 @@ static bool nsgtk_plot_bitmap_tile(int x, int y, int width, int height, bool repeat_x, bool repeat_y); static bool nsgtk_plot_group_start(const char *name); static bool nsgtk_plot_group_end(void); -static void nsgtk_set_colour(colour c); static void nsgtk_set_solid(void); /**< Set for drawing solid lines */ static void nsgtk_set_dotted(void); /**< Set for drawing dotted lines */ static void nsgtk_set_dashed(void); /**< Set for drawing dashed lines */ -void nsgtk_plot_set_scale(float s); -float nsgtk_plot_get_scale(void); static GdkRectangle cliprect; static float nsgtk_plot_scale = 1.0; diff --git a/gtk/gtk_thumbnail.c b/gtk/gtk_thumbnail.c index 0de132d2d..d7abf84b6 100644 --- a/gtk/gtk_thumbnail.c +++ b/gtk/gtk_thumbnail.c @@ -40,7 +40,7 @@ bool thumbnail_create(struct content *content, struct bitmap *bitmap, gint height = gdk_pixbuf_get_height(pixbuf); gint depth = (gdk_screen_get_system_visual(gdk_screen_get_default()))->depth; GdkPixmap *pixmap = gdk_pixmap_new(NULL, width, height, depth); - GdkColor c = { 0, 65535, 65535, 65535 }; + GdkColor c = { 0xffffff, 65535, 65535, 65535 }; float scale = 1.0; assert(content); @@ -58,9 +58,12 @@ bool thumbnail_create(struct content *content, struct bitmap *bitmap, /* set to plot to pixmap */ current_drawable = pixmap; current_gc = gdk_gc_new(current_drawable); + gdk_gc_set_foreground(current_gc, &c); #ifdef CAIRO_VERSION current_cr = gdk_cairo_create(current_drawable); + cairo_set_source_rgba(current_cr, 1, 1, 1, 1); #endif + gdk_draw_rectangle(pixmap, current_gc, TRUE, 0, 0, width, height); /* render the content */ content_redraw(content, 0, 0, width, height, diff --git a/gtk/gtk_window.h b/gtk/gtk_window.h index 73e890f1e..f44545773 100644 --- a/gtk/gtk_window.h +++ b/gtk/gtk_window.h @@ -17,4 +17,4 @@ extern cairo_t *current_cr; void nsgtk_plot_set_scale(float s); float nsgtk_plot_get_scale(void); - +void nsgtk_set_colour(colour c); diff --git a/makefile b/makefile index e13f0b501..def3f2beb 100644 --- a/makefile +++ b/makefile @@ -65,7 +65,7 @@ OBJECTS_GTK += filetyped.o # debug/ OBJECTS_GTK += browser.o history_core.o netsurf.o selection.o textinput.o \ version.o # desktop/ OBJECTS_GTK += font_pango.o gtk_bitmap.o gtk_gui.o \ - gtk_schedule.o \ + gtk_schedule.o gtk_thumbnail.o \ gtk_plotters.o gtk_treeview.o gtk_window.o # gtk/ -- cgit v1.2.3