Index: trunk/src/draw.c =================================================================== --- trunk/src/draw.c (revision 21416) +++ trunk/src/draw.c (revision 21417) @@ -202,7 +202,6 @@ pcb_hid_expose_ctx_t hid_exp; hid_exp.view = *info->drawn_area; - hid_exp.force = 0; if (pcb_layer_gui_set_vlayer(PCB, PCB_VLY_TOP_ASSY, 0, &info->xform_exporter)) { pcb_draw_assembly(info, PCB_LYT_TOP); @@ -992,13 +991,12 @@ pcb_output_t save; expose_begin(&save, hid); - if ((pcb_layer_gui_set_vlayer(PCB, PCB_VLY_DIALOG, 0, NULL)) || (e->force)) { pcb_gui->set_drawing_mode(PCB_HID_COMP_RESET, 1, &e->view); pcb_gui->set_drawing_mode(PCB_HID_COMP_POSITIVE, 1, &e->view); e->dialog_draw(pcb_draw_out.fgGC, e); pcb_gui->set_drawing_mode(PCB_HID_COMP_FLUSH, 1, &e->view); pcb_gui->end_layer(); - } + expose_end(&save); } Index: trunk/src/hid.h =================================================================== --- trunk/src/hid.h (revision 21416) +++ trunk/src/hid.h (revision 21417) @@ -556,11 +556,7 @@ struct pcb_hid_expose_ctx_s { pcb_box_t view; - unsigned force:1; /* draw even if layer set fails */ - void *draw_data; - - /* for PCB_LYT_DIALOG */ pcb_hid_dialog_draw_t dialog_draw; /* also use for generic draw */ }; Index: trunk/src/layer.h =================================================================== --- trunk/src/layer.h (revision 21416) +++ trunk/src/layer.h (revision 21417) @@ -75,7 +75,6 @@ PCB_VLY_PLATED_DRILL, PCB_VLY_UNPLATED_DRILL, PCB_VLY_CSECT, - PCB_VLY_DIALOG, /* for determining the range, do not use */ PCB_VLY_end, Index: trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c =================================================================== --- trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 21416) +++ trunk/src_plugins/hid_gtk2_gdk/gtkhid-gdk.c (revision 21417) @@ -1115,8 +1115,6 @@ ctx.view.Y1 = MAX(0, MIN(PCB->MaxHeight, ctx.view.Y1)); ctx.view.Y2 = MAX(0, MIN(PCB->MaxHeight, ctx.view.Y2)); - ctx.force = 0; - eleft = Vx(0); eright = Vx(PCB->MaxWidth); etop = Vy(0); Index: trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c =================================================================== --- trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c (revision 21416) +++ trunk/src_plugins/hid_gtk3_cairo/gtkhid-cairo.c (revision 21417) @@ -1095,8 +1095,6 @@ ctx.view.Y1 = MAX(0, MIN(PCB->MaxHeight, ctx.view.Y1)); ctx.view.Y2 = MAX(0, MIN(PCB->MaxHeight, ctx.view.Y2)); - ctx.force = 0; - eleft = Vx(0); eright = Vx(PCB->MaxWidth); etop = Vy(0); Index: trunk/src_plugins/hid_lesstif/dlg_attr_misc.c =================================================================== --- trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 21416) +++ trunk/src_plugins/hid_lesstif/dlg_attr_misc.c (revision 21417) @@ -162,7 +162,6 @@ memset(&pd->exp_ctx, 0, sizeof(pd->exp_ctx)); pd->exp_ctx.draw_data = pd; pd->exp_ctx.dialog_draw = ltf_preview_expose; - pd->exp_ctx.force = 1; pd->hid_ctx = ctx; prv->hid_zoomto_cb = ltf_preview_zoomto; Index: trunk/src_plugins/lib_gtk_common/wt_preview.c =================================================================== --- trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 21416) +++ trunk/src_plugins/lib_gtk_common/wt_preview.c (revision 21417) @@ -467,7 +467,6 @@ update_expose_data(prv); - prv->expose_data.force = 1; prv->init_drawing_widget(GTK_WIDGET(prv), prv->gport); gtk_widget_add_events(GTK_WIDGET(prv), GDK_EXPOSURE_MASK | GDK_SCROLL_MASK