callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plug-ins: move the expose handler to map-pbject-preview.c

Browse Source
This commit is contained in:
Michael Natterer
2011-02-13 14:16:32 +01:00
parent 9912e3f4ee
commit 491e55c4e4
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -360,14 +360,15 @@ compute_preview_image (void)
clear_light_marker (); clear_light_marker ();
} }
void gboolean
draw_preview_image (void) preview_expose (GtkWidget *widget,
GdkEventExpose *eevent)
{ {
gint startx, starty, pw, ph; gint startx, starty, pw, ph;
GdkColor color; GdkColor color;
cairo_t *cr; cairo_t *cr;
cr = gdk_cairo_create (gtk_widget_get_window (previewarea)); cr = gdk_cairo_create (eevent->window);
color.red = 0xFFFF; color.red = 0xFFFF;
color.green = 0xFFFF; color.green = 0xFFFF;
@ -388,4 +389,6 @@ draw_preview_image (void)
draw_lights (startx, starty, pw, ph); draw_lights (startx, starty, pw, ph);
cairo_destroy (cr); cairo_destroy (cr);
return FALSE;
} }

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

@ -13,11 +13,12 @@ extern gint lightx,lighty;
/* Externally visible functions */ /* Externally visible functions */
/* ============================ */ /* ============================ */
void compute_preview_image (void); void compute_preview_image (void);
void draw_preview_image (void); gboolean preview_expose (GtkWidget *widget,
gint check_light_hit (gint xpos, GdkEventExpose *eevent);
gint ypos); gint check_light_hit (gint xpos,
void update_light (gint xpos, gint ypos);
gint ypos); void update_light (gint xpos,
gint ypos);
#endif /* __MAPOBJECT_PREVIEW_H__ */ #endif /* __MAPOBJECT_PREVIEW_H__ */

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

@ -299,10 +299,6 @@ preview_events (GtkWidget *area,
switch (event->type) switch (event->type)
{ {
case GDK_EXPOSE:
draw_preview_image ();
break;
case GDK_ENTER_NOTIFY: case GDK_ENTER_NOTIFY:
break; break;
@ -1319,6 +1315,10 @@ main_dialog (GimpDrawable *drawable)
G_CALLBACK (preview_events), G_CALLBACK (preview_events),
previewarea); previewarea);
g_signal_connect (previewarea, "expose-event",
G_CALLBACK (preview_expose),
previewarea);
hbox = gtk_hbox_new (FALSE, 6); hbox = gtk_hbox_new (FALSE, 6);
gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox); gtk_widget_show (hbox);