X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libview%2Fev-view-presentation.c;h=96977184c5e0f01ab55fa4b043f146ff9b27cbff;hb=e769474337c9a6ffdaed2327056e8de2f7ca9ee4;hp=66d3589c30b2144158e0e6e828e4d41ae5e34ec3;hpb=0e8323d1dc071decce230e980e57d68e260d574d;p=evince.git diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c index 66d3589c..96977184 100644 --- a/libview/ev-view-presentation.c +++ b/libview/ev-view-presentation.c @@ -901,7 +901,7 @@ ev_view_presentation_update_current_surface (EvViewPresentation *pview, } static void -ev_view_presentation_destroy (GtkObject *object) +ev_view_presentation_dispose (GObject *object) { EvViewPresentation *pview = EV_VIEW_PRESENTATION (object); @@ -945,19 +945,28 @@ ev_view_presentation_destroy (GtkObject *object) pview->goto_entry = NULL; } - GTK_OBJECT_CLASS (ev_view_presentation_parent_class)->destroy (object); + G_OBJECT_CLASS (ev_view_presentation_parent_class)->dispose (object); } static void -ev_view_presentation_size_request (GtkWidget *widget, - GtkRequisition *requisition) +ev_view_presentation_get_preferred_width (GtkWidget *widget, + gint *minimum, + gint *natural) { - requisition->width = 0; - requisition->height = 0; + *minimum = *natural = 0; } static void -ev_view_presentation_draw_end_page (EvViewPresentation *pview) +ev_view_presentation_get_preferred_height (GtkWidget *widget, + gint *minimum, + gint *natural) +{ + *minimum = *natural = 0; +} + +static void +ev_view_presentation_draw_end_page (EvViewPresentation *pview, + cairo_t *cr) { GtkWidget *widget = GTK_WIDGET (pview); PangoLayout *layout; @@ -983,34 +992,36 @@ ev_view_presentation_draw_end_page (EvViewPresentation *pview) area.width = allocation.width; area.height = allocation.height; - gtk_paint_layout (gtk_widget_get_style (widget), - gtk_widget_get_window (widget), - gtk_widget_get_state (widget), - FALSE, - &area, - widget, - NULL, - 15, - 15, - layout); + gtk_paint_layout (gtk_widget_get_style (widget), + cr, + gtk_widget_get_state (widget), + FALSE, + widget, + NULL, + 15, + 15, + layout); pango_font_description_free (font_desc); g_object_unref (layout); } static gboolean -ev_view_presentation_expose_event (GtkWidget *widget, - GdkEventExpose *event) +ev_view_presentation_draw (GtkWidget *widget, + cairo_t *cr) { EvViewPresentation *pview = EV_VIEW_PRESENTATION (widget); GdkRectangle page_area; GdkRectangle overlap; cairo_surface_t *surface; - cairo_t *cr; + GdkRectangle clip_rect; + + if (!gdk_cairo_get_clip_rectangle (cr, &clip_rect)) + return FALSE; switch (pview->state) { case EV_PRESENTATION_END: - ev_view_presentation_draw_end_page (pview); + ev_view_presentation_draw_end_page (pview, cr); return FALSE; case EV_PRESENTATION_BLACK: case EV_PRESENTATION_WHITE: @@ -1023,7 +1034,7 @@ ev_view_presentation_expose_event (GtkWidget *widget, if (ev_transition_animation_ready (pview->animation)) { ev_view_presentation_get_page_area (pview, &page_area); - cr = gdk_cairo_create (gtk_widget_get_window (widget)); + cairo_save (cr); /* normalize to x=0, y=0 */ cairo_translate (cr, page_area.x, page_area.y); @@ -1033,7 +1044,8 @@ ev_view_presentation_expose_event (GtkWidget *widget, page_area.width--; ev_transition_animation_paint (pview->animation, cr, page_area); - cairo_destroy (cr); + + cairo_restore (cr); } return TRUE; @@ -1049,8 +1061,8 @@ ev_view_presentation_expose_event (GtkWidget *widget, } ev_view_presentation_get_page_area (pview, &page_area); - if (gdk_rectangle_intersect (&page_area, &(event->area), &overlap)) { - cr = gdk_cairo_create (gtk_widget_get_window (widget)); + if (gdk_rectangle_intersect (&page_area, &clip_rect, &overlap)) { + cairo_save (cr); /* Try to fix rounding errors. See bug #438760 */ if (overlap.width == page_area.width) @@ -1059,7 +1071,8 @@ ev_view_presentation_expose_event (GtkWidget *widget, cairo_rectangle (cr, overlap.x, overlap.y, overlap.width, overlap.height); cairo_set_source_surface (cr, surface, page_area.x, page_area.y); cairo_fill (cr); - cairo_destroy (cr); + + cairo_restore (cr); } return FALSE; @@ -1072,7 +1085,7 @@ ev_view_presentation_key_press_event (GtkWidget *widget, EvViewPresentation *pview = EV_VIEW_PRESENTATION (widget); if (pview->state == EV_PRESENTATION_END) - return gtk_bindings_activate_event (GTK_OBJECT (widget), event); + return gtk_bindings_activate_event (G_OBJECT (widget), event); switch (event->keyval) { case GDK_KEY_b: @@ -1128,7 +1141,7 @@ ev_view_presentation_key_press_event (GtkWidget *widget, return TRUE; } - return gtk_bindings_activate_event (GTK_OBJECT (widget), event); + return gtk_bindings_activate_event (G_OBJECT (widget), event); } static gboolean @@ -1222,9 +1235,6 @@ ev_view_presentation_realize (GtkWidget *widget) attributes.window_type = GDK_WINDOW_CHILD; attributes.wclass = GDK_INPUT_OUTPUT; attributes.visual = gtk_widget_get_visual (widget); -#if !GTK_CHECK_VERSION (2, 90, 8) - attributes.colormap = gtk_widget_get_colormap (widget); -#endif gtk_widget_get_allocation (widget, &allocation); attributes.x = allocation.x; @@ -1244,9 +1254,6 @@ ev_view_presentation_realize (GtkWidget *widget) window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, GDK_WA_X | GDK_WA_Y | -#if !GTK_CHECK_VERSION (2, 90, 8) - GDK_WA_COLORMAP | -#endif GDK_WA_VISUAL); gdk_window_set_user_data (window, widget); @@ -1370,22 +1377,22 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass); - GtkObjectClass *gtk_object_class = GTK_OBJECT_CLASS (klass); GtkBindingSet *binding_set; klass->change_page = ev_view_presentation_change_page; - widget_class->size_request = ev_view_presentation_size_request; + gobject_class->dispose = ev_view_presentation_dispose; + + widget_class->get_preferred_width = ev_view_presentation_get_preferred_width; + widget_class->get_preferred_height = ev_view_presentation_get_preferred_height; widget_class->realize = ev_view_presentation_realize; - widget_class->expose_event = ev_view_presentation_expose_event; + widget_class->draw = ev_view_presentation_draw; widget_class->key_press_event = ev_view_presentation_key_press_event; widget_class->button_release_event = ev_view_presentation_button_release_event; widget_class->focus_out_event = ev_view_presentation_focus_out; widget_class->motion_notify_event = ev_view_presentation_motion_notify_event; widget_class->scroll_event = ev_view_presentation_scroll_event; - gtk_object_class->destroy = ev_view_presentation_destroy; - gobject_class->constructor = ev_view_presentation_constructor; gobject_class->set_property = ev_view_presentation_set_property;