X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=libview%2Fev-view.c;h=544a1fee85e5bc9224a90b1df28778decb7764da;hb=ab0edaffd2f1790ec8ac7ac17f90e0a8007b92cd;hp=bdf738f86b5e8cbc986ca0f5fa671a6d0d130d58;hpb=d6a02d14c7ae7e3f3a01d2d025324889bedf2275;p=evince.git diff --git a/libview/ev-view.c b/libview/ev-view.c index bdf738f8..544a1fee 100644 --- a/libview/ev-view.c +++ b/libview/ev-view.c @@ -171,8 +171,7 @@ static gboolean ev_view_enter_notify_event (GtkWidget GdkEventCrossing *event); static gboolean ev_view_leave_notify_event (GtkWidget *widget, GdkEventCrossing *event); -static void ev_view_style_set (GtkWidget *widget, - GtkStyle *old_style); +static void ev_view_style_updated (GtkWidget *widget); static void ev_view_remove_all (EvView *view); static AtkObject *ev_view_get_accessible (GtkWidget *widget); @@ -484,7 +483,7 @@ ev_view_get_scrollbar_size (EvView *view, } gtk_widget_style_get (swindow, "scrollbar_spacing", &spacing, NULL); - gtk_widget_size_request (sb, &req); + gtk_widget_get_preferred_size (sb, &req, NULL); return (orientation == GTK_ORIENTATION_VERTICAL ? req.width : req.height) + spacing; } @@ -4182,13 +4181,12 @@ ev_view_enter_notify_event (GtkWidget *widget, GdkEventCrossing *event) } static void -ev_view_style_set (GtkWidget *widget, - GtkStyle *old_style) +ev_view_style_updated (GtkWidget *widget) { if (EV_VIEW (widget)->pixbuf_cache) ev_pixbuf_cache_style_changed (EV_VIEW (widget)->pixbuf_cache); - GTK_WIDGET_CLASS (ev_view_parent_class)->style_set (widget, old_style); + GTK_WIDGET_CLASS (ev_view_parent_class)->style_updated (widget); } /*** Drawing ***/ @@ -4199,19 +4197,14 @@ draw_rubberband (EvView *view, const GdkRectangle *rect, gdouble alpha) { - GtkStyle *style; - const GdkColor *fill_color_gdk; - gdouble r, g, b; - - style = gtk_widget_get_style (GTK_WIDGET (view)); - fill_color_gdk = &style->base[GTK_STATE_SELECTED]; - r = fill_color_gdk->red / 65535.; - g = fill_color_gdk->green / 65535.; - b = fill_color_gdk->blue / 65535.; + GtkStyleContext *context; + GdkRGBA color; + context = gtk_widget_get_style_context (GTK_WIDGET (view)); + gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &color); cairo_save (cr); - cairo_set_source_rgba (cr, r, g, b, alpha); + cairo_set_source_rgba (cr, color.red, color.green, color.blue, alpha); cairo_rectangle (cr, rect->x - view->scroll_x, rect->y - view->scroll_y, @@ -4219,7 +4212,7 @@ draw_rubberband (EvView *view, cairo_fill_preserve (cr); cairo_set_line_width (cr, 0.5); - cairo_set_source_rgb (cr, r, g, b); + cairo_set_source_rgb (cr, color.red, color.green, color.blue); cairo_stroke (cr); cairo_restore (cr); @@ -4290,13 +4283,11 @@ focus_annotation (EvView *view, doc_rect_to_view_rect (view, page, &mapping->area, &rect); - gtk_paint_focus (gtk_widget_get_style (widget), - cr, - gtk_widget_get_state (widget), - widget, NULL, - rect.x - view->scroll_x, - rect.y - view->scroll_y, - rect.width + 1, rect.height + 1); + gtk_render_focus (gtk_widget_get_style_context (widget), + cr, + rect.x - view->scroll_x, + rect.y - view->scroll_y, + rect.width + 1, rect.height + 1); } static void @@ -4635,16 +4626,17 @@ ev_view_set_property (GObject *object, } } -static AtkObject * -ev_view_get_accessible (GtkWidget *widget) +/* Accessibility */ +static void +ev_view_init_accessibility (EvView *view) { static gboolean first_time = TRUE; if (first_time) { AtkObjectFactory *factory; AtkRegistry *registry; - GType derived_type; - GType derived_atk_type; + GType derived_type; + GType derived_atk_type; /* * Figure out whether accessibility is enabled by looking at the @@ -4661,13 +4653,26 @@ ev_view_get_accessible (GtkWidget *widget) atk_registry_set_factory_type (registry, EV_TYPE_VIEW, ev_view_accessible_factory_get_type ()); - EV_VIEW (widget)->a11y_enabled = TRUE; + view->a11y_enabled = TRUE; } first_time = FALSE; - } + } +} + +static AtkObject * +ev_view_get_accessible (GtkWidget *widget) +{ + ev_view_init_accessibility (EV_VIEW (widget)); return GTK_WIDGET_CLASS (ev_view_parent_class)->get_accessible (widget); } +static gboolean +ev_view_is_a11y_enabled (EvView *view) +{ + ev_view_init_accessibility (view); + return view->a11y_enabled; +} + static void ev_view_class_init (EvViewClass *class) { @@ -4694,7 +4699,7 @@ ev_view_class_init (EvViewClass *class) widget_class->scroll_event = ev_view_scroll_event; widget_class->enter_notify_event = ev_view_enter_notify_event; widget_class->leave_notify_event = ev_view_leave_notify_event; - widget_class->style_set = ev_view_style_set; + widget_class->style_updated = ev_view_style_updated; widget_class->drag_data_get = ev_view_drag_data_get; widget_class->drag_motion = ev_view_drag_motion; widget_class->popup_menu = ev_view_popup_menu; @@ -4966,7 +4971,7 @@ setup_caches (EvView *view) view->height_to_page_cache = ev_view_get_height_to_page_cache (view); view->pixbuf_cache = ev_pixbuf_cache_new (GTK_WIDGET (view), view->model, view->pixbuf_cache_size); view->page_cache = ev_page_cache_new (view->document); - if (view->a11y_enabled) { + if (ev_view_is_a11y_enabled (view)) { EvJobPageDataFlags flags = ev_page_cache_get_flags (view->page_cache); ev_page_cache_set_flags (view->page_cache, @@ -6262,7 +6267,7 @@ ev_view_set_cursor (EvView *view, EvViewCursor new_cursor) gdk_window_set_cursor (window, cursor); gdk_flush (); if (cursor) - gdk_cursor_unref (cursor); + g_object_unref (cursor); } void