dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

plug-ins: port map-object to GTK+ 3.x

This commit is contained in:
Michael Natterer 2011-02-16 22:03:09 +01:00
parent b9b39fc32a
commit 4b92434bb9
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plug-ins/map-object/map-object-preview.c
View File

@ -302,22 +302,16 @@ compute_preview_image (void)
} }
gboolean gboolean
preview_expose (GtkWidget *widget, preview_draw (GtkWidget *widget,
GdkEventExpose *eevent) cairo_t *cr)
{ {
gint startx, starty, pw, ph; gint startx, starty, pw, ph;
cairo_t *cr;
cr = gdk_cairo_create (eevent->window);
pw = PREVIEW_WIDTH * mapvals.zoom; pw = PREVIEW_WIDTH * mapvals.zoom;
ph = PREVIEW_HEIGHT * mapvals.zoom; ph = PREVIEW_HEIGHT * mapvals.zoom;
startx = (PREVIEW_WIDTH - pw) / 2; startx = (PREVIEW_WIDTH - pw) / 2;
starty = (PREVIEW_HEIGHT - ph) / 2; starty = (PREVIEW_HEIGHT - ph) / 2;
if (pw != PREVIEW_WIDTH || ph != PREVIEW_HEIGHT)
gdk_window_clear (gtk_widget_get_window (previewarea));
cairo_set_source_surface (cr, preview_surface, startx, starty); cairo_set_source_surface (cr, preview_surface, startx, starty);
cairo_rectangle (cr, startx, starty, pw, ph); cairo_rectangle (cr, startx, starty, pw, ph);
cairo_clip (cr); cairo_clip (cr);
@ -332,8 +326,6 @@ preview_expose (GtkWidget *widget,
cairo_reset_clip (cr); cairo_reset_clip (cr);
draw_lights (cr, startx, starty, pw, ph); draw_lights (cr, startx, starty, pw, ph);
cairo_destroy (cr);
return FALSE; return FALSE;
} }

4
plug-ins/map-object/map-object-preview.h
View File

@ -16,8 +16,8 @@ extern gint lightx,lighty;
/* ============================ */ /* ============================ */
void compute_preview_image (void); void compute_preview_image (void);
gboolean preview_expose (GtkWidget *widget, gboolean preview_draw (GtkWidget *widget,
GdkEventExpose *eevent); cairo_t *cr);
gint check_light_hit (gint xpos, gint check_light_hit (gint xpos,
gint ypos); gint ypos);
void update_light (gint xpos, void update_light (gint xpos,

4
plug-ins/map-object/map-object-ui.c
View File

@ -1375,8 +1375,8 @@ main_dialog (GimpDrawable *drawable)
G_CALLBACK (preview_events), G_CALLBACK (preview_events),
previewarea); previewarea);
g_signal_connect (previewarea, "expose-event", g_signal_connect (previewarea, "draw",
G_CALLBACK (preview_expose), G_CALLBACK (preview_draw),
previewarea); previewarea);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);