X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkviewport.c;h=95ad988d0db4a451120358c4a8e30f1ebb32f985;hb=9d0febc9a64a5bfb0fcfc3a88de4757f6c1ff090;hp=8e92c41e21732fb85fcebabcaf0a716ceeb01e3b;hpb=e087fe7e99ae6842e9b591c50252362c5a6b1d2b;p=~andy%2Fgtk diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index 8e92c41e2..95ad988d0 100644 --- a/gtk/gtkviewport.c +++ b/gtk/gtkviewport.c @@ -12,9 +12,7 @@ * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. + * License along with this library. If not, see . */ /* @@ -25,10 +23,13 @@ */ #include "config.h" + #include "gtkviewport.h" -#include "gtksizerequest.h" + #include "gtkintl.h" #include "gtkmarshalers.h" +#include "gtkscrollable.h" +#include "gtktypebuiltins.h" #include "gtkprivate.h" @@ -41,7 +42,7 @@ * The #GtkViewport widget acts as an adaptor class, implementing * scrollability for child widgets that lack their own scrolling * capabilities. Use #GtkViewport to scroll child widgets such as - * #GtkTable, #GtkBox, and so on. + * #GtkGrid, #GtkBox, and so on. * * If a widget has native scrolling abilities, such as #GtkTextView, * #GtkTreeView or #GtkIconview, it can be added to a #GtkScrolledWindow @@ -62,18 +63,23 @@ struct _GtkViewportPrivate GdkWindow *bin_window; GdkWindow *view_window; + + /* GtkScrollablePolicy needs to be checked when + * driving the scrollable adjustment values */ + guint hscroll_policy : 1; + guint vscroll_policy : 1; }; enum { PROP_0, PROP_HADJUSTMENT, PROP_VADJUSTMENT, + PROP_HSCROLL_POLICY, + PROP_VSCROLL_POLICY, PROP_SHADOW_TYPE }; -static void gtk_viewport_finalize (GObject *object); -static void gtk_viewport_destroy (GtkObject *object); static void gtk_viewport_set_property (GObject *object, guint prop_id, const GValue *value, @@ -82,78 +88,65 @@ static void gtk_viewport_get_property (GObject *object, guint prop_id, GValue *value, GParamSpec *pspec); -static void gtk_viewport_set_scroll_adjustments (GtkViewport *viewport, - GtkAdjustment *hadjustment, - GtkAdjustment *vadjustment); +static void gtk_viewport_destroy (GtkWidget *widget); static void gtk_viewport_realize (GtkWidget *widget); static void gtk_viewport_unrealize (GtkWidget *widget); -static gint gtk_viewport_expose (GtkWidget *widget, - GdkEventExpose *event); +static gint gtk_viewport_draw (GtkWidget *widget, + cairo_t *cr); static void gtk_viewport_add (GtkContainer *container, GtkWidget *widget); static void gtk_viewport_size_allocate (GtkWidget *widget, GtkAllocation *allocation); static void gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment, gpointer data); -static void gtk_viewport_style_set (GtkWidget *widget, - GtkStyle *previous_style); +static void gtk_viewport_style_updated (GtkWidget *widget); -static void gtk_viewport_size_request_init (GtkSizeRequestIface *iface); -static void gtk_viewport_get_width (GtkSizeRequest *widget, - gint *minimum_size, - gint *natural_size); -static void gtk_viewport_get_height (GtkSizeRequest *widget, - gint *minimum_size, - gint *natural_size); +static void gtk_viewport_get_preferred_width (GtkWidget *widget, + gint *minimum_size, + gint *natural_size); +static void gtk_viewport_get_preferred_height (GtkWidget *widget, + gint *minimum_size, + gint *natural_size); +static void viewport_set_adjustment (GtkViewport *viewport, + GtkOrientation orientation, + GtkAdjustment *adjustment); G_DEFINE_TYPE_WITH_CODE (GtkViewport, gtk_viewport, GTK_TYPE_BIN, - G_IMPLEMENT_INTERFACE (GTK_TYPE_SIZE_REQUEST, - gtk_viewport_size_request_init)) + G_IMPLEMENT_INTERFACE (GTK_TYPE_SCROLLABLE, NULL)) static void gtk_viewport_class_init (GtkViewportClass *class) { - GtkObjectClass *object_class; GObjectClass *gobject_class; GtkWidgetClass *widget_class; GtkContainerClass *container_class; - object_class = (GtkObjectClass*) class; gobject_class = G_OBJECT_CLASS (class); widget_class = (GtkWidgetClass*) class; container_class = (GtkContainerClass*) class; - gobject_class->finalize = gtk_viewport_finalize; gobject_class->set_property = gtk_viewport_set_property; gobject_class->get_property = gtk_viewport_get_property; - object_class->destroy = gtk_viewport_destroy; - + + widget_class->destroy = gtk_viewport_destroy; widget_class->realize = gtk_viewport_realize; widget_class->unrealize = gtk_viewport_unrealize; - widget_class->expose_event = gtk_viewport_expose; + widget_class->draw = gtk_viewport_draw; widget_class->size_allocate = gtk_viewport_size_allocate; - widget_class->style_set = gtk_viewport_style_set; + widget_class->style_updated = gtk_viewport_style_updated; + widget_class->get_preferred_width = gtk_viewport_get_preferred_width; + widget_class->get_preferred_height = gtk_viewport_get_preferred_height; - container_class->add = gtk_viewport_add; + gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_VIEWPORT); - class->set_scroll_adjustments = gtk_viewport_set_scroll_adjustments; + container_class->add = gtk_viewport_add; - g_object_class_install_property (gobject_class, - PROP_HADJUSTMENT, - g_param_spec_object ("hadjustment", - P_("Horizontal adjustment"), - P_("The GtkAdjustment that determines the values of the horizontal position for this viewport"), - GTK_TYPE_ADJUSTMENT, - GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT)); - - g_object_class_install_property (gobject_class, - PROP_VADJUSTMENT, - g_param_spec_object ("vadjustment", - P_("Vertical adjustment"), - P_("The GtkAdjustment that determines the values of the vertical position for this viewport"), - GTK_TYPE_ADJUSTMENT, - GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT)); + /* GtkScrollable implementation */ + g_object_class_override_property (gobject_class, PROP_HADJUSTMENT, "hadjustment"); + g_object_class_override_property (gobject_class, PROP_VADJUSTMENT, "vadjustment"); + g_object_class_override_property (gobject_class, PROP_HSCROLL_POLICY, "hscroll-policy"); + g_object_class_override_property (gobject_class, PROP_VSCROLL_POLICY, "vscroll-policy"); g_object_class_install_property (gobject_class, PROP_SHADOW_TYPE, @@ -164,26 +157,6 @@ gtk_viewport_class_init (GtkViewportClass *class) GTK_SHADOW_IN, GTK_PARAM_READWRITE)); - /** - * GtkViewport::set-scroll-adjustments - * @horizontal: the horizontal #GtkAdjustment - * @vertical: the vertical #GtkAdjustment - * - * Set the scroll adjustments for the viewport. Usually scrolled containers - * like #GtkScrolledWindow will emit this signal to connect two instances - * of #GtkScrollbar to the scroll directions of the #GtkViewport. - */ - widget_class->set_scroll_adjustments_signal = - g_signal_new (I_("set-scroll-adjustments"), - G_OBJECT_CLASS_TYPE (gobject_class), - G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION, - G_STRUCT_OFFSET (GtkViewportClass, set_scroll_adjustments), - NULL, NULL, - _gtk_marshal_VOID__OBJECT_OBJECT, - G_TYPE_NONE, 2, - GTK_TYPE_ADJUSTMENT, - GTK_TYPE_ADJUSTMENT); - g_type_class_add_private (class, sizeof (GtkViewportPrivate)); } @@ -200,10 +173,18 @@ gtk_viewport_set_property (GObject *object, switch (prop_id) { case PROP_HADJUSTMENT: - gtk_viewport_set_hadjustment (viewport, g_value_get_object (value)); + viewport_set_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL, g_value_get_object (value)); break; case PROP_VADJUSTMENT: - gtk_viewport_set_vadjustment (viewport, g_value_get_object (value)); + viewport_set_adjustment (viewport, GTK_ORIENTATION_VERTICAL, g_value_get_object (value)); + break; + case PROP_HSCROLL_POLICY: + viewport->priv->hscroll_policy = g_value_get_enum (value); + gtk_widget_queue_resize (GTK_WIDGET (viewport)); + break; + case PROP_VSCROLL_POLICY: + viewport->priv->vscroll_policy = g_value_get_enum (value); + gtk_widget_queue_resize (GTK_WIDGET (viewport)); break; case PROP_SHADOW_TYPE: gtk_viewport_set_shadow_type (viewport, g_value_get_enum (value)); @@ -231,6 +212,12 @@ gtk_viewport_get_property (GObject *object, case PROP_VADJUSTMENT: g_value_set_object (value, priv->vadjustment); break; + case PROP_HSCROLL_POLICY: + g_value_set_enum (value, priv->hscroll_policy); + break; + case PROP_VSCROLL_POLICY: + g_value_set_enum (value, priv->vscroll_policy); + break; case PROP_SHADOW_TYPE: g_value_set_enum (value, priv->shadow_type); break; @@ -260,17 +247,20 @@ gtk_viewport_init (GtkViewport *viewport) priv->bin_window = NULL; priv->hadjustment = NULL; priv->vadjustment = NULL; + + viewport_set_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL, NULL); + viewport_set_adjustment (viewport, GTK_ORIENTATION_VERTICAL, NULL); } /** * gtk_viewport_new: - * @hadjustment: horizontal adjustment. - * @vadjustment: vertical adjustment. - * @returns: a new #GtkViewport. + * @hadjustment: horizontal adjustment + * @vadjustment: vertical adjustment * * Creates a new #GtkViewport with the given adjustments. * - **/ + * Returns: a new #GtkViewport + */ GtkWidget* gtk_viewport_new (GtkAdjustment *hadjustment, GtkAdjustment *vadjustment) @@ -306,25 +296,60 @@ viewport_disconnect_adjustment (GtkViewport *viewport, } static void -gtk_viewport_finalize (GObject *object) +gtk_viewport_destroy (GtkWidget *widget) { - GtkViewport *viewport = GTK_VIEWPORT (object); + GtkViewport *viewport = GTK_VIEWPORT (widget); viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL); viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_VERTICAL); - G_OBJECT_CLASS (gtk_viewport_parent_class)->finalize (object); + GTK_WIDGET_CLASS (gtk_viewport_parent_class)->destroy (widget); } static void -gtk_viewport_destroy (GtkObject *object) +viewport_get_view_allocation (GtkViewport *viewport, + GtkAllocation *view_allocation) { - GtkViewport *viewport = GTK_VIEWPORT (object); + GtkViewportPrivate *priv = viewport->priv; + GtkWidget *widget = GTK_WIDGET (viewport); + GtkAllocation allocation; + GtkStyleContext *context; + GtkStateFlags state; + GtkBorder padding, border; + guint border_width; - viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL); - viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_VERTICAL); + gtk_widget_get_allocation (widget, &allocation); + border_width = gtk_container_get_border_width (GTK_CONTAINER (viewport)); - GTK_OBJECT_CLASS (gtk_viewport_parent_class)->destroy (object); + view_allocation->x = 0; + view_allocation->y = 0; + + context = gtk_widget_get_style_context (widget); + state = gtk_widget_get_state_flags (widget); + gtk_style_context_save (context); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME); + + gtk_style_context_get_padding (context, state, &padding); + gtk_style_context_get_border (context, state, &border); + + gtk_style_context_restore (context); + + if (priv->shadow_type != GTK_SHADOW_NONE) + { + view_allocation->x = border.left; + view_allocation->y = border.top; + } + + view_allocation->x += padding.left; + view_allocation->y += padding.top; + view_allocation->width = MAX (1, allocation.width - padding.left - padding.right - border_width * 2); + view_allocation->height = MAX (1, allocation.height - padding.top - padding.bottom - border_width * 2); + + if (priv->shadow_type != GTK_SHADOW_NONE) + { + view_allocation->width = MAX (1, view_allocation->width - border.left - border.right); + view_allocation->height = MAX (1, view_allocation->height - border.top - border.bottom); + } } /** @@ -334,20 +359,15 @@ gtk_viewport_destroy (GtkObject *object) * Returns the horizontal adjustment of the viewport. * * Return value: (transfer none): the horizontal adjustment of @viewport. + * + * Deprecated: 3.0: Use gtk_scrollable_get_hadjustment() **/ GtkAdjustment* gtk_viewport_get_hadjustment (GtkViewport *viewport) { - GtkViewportPrivate *priv; - g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL); - priv = viewport->priv; - - if (!priv->hadjustment) - gtk_viewport_set_hadjustment (viewport, NULL); - - return priv->hadjustment; + return viewport->priv->hadjustment; } /** @@ -357,147 +377,113 @@ gtk_viewport_get_hadjustment (GtkViewport *viewport) * Returns the vertical adjustment of the viewport. * * Return value: (transfer none): the vertical adjustment of @viewport. + * + * Deprecated: 3.0: Use gtk_scrollable_get_vadjustment() **/ GtkAdjustment* gtk_viewport_get_vadjustment (GtkViewport *viewport) { - GtkViewportPrivate *priv; - g_return_val_if_fail (GTK_IS_VIEWPORT (viewport), NULL); - priv = viewport->priv; - - if (!priv->vadjustment) - gtk_viewport_set_vadjustment (viewport, NULL); - - return priv->vadjustment; + return viewport->priv->vadjustment; } static void -viewport_get_view_allocation (GtkViewport *viewport, - GtkAllocation *view_allocation) -{ - GtkViewportPrivate *priv = viewport->priv; - GtkStyle *style; - GtkWidget *widget = GTK_WIDGET (viewport); - GtkAllocation allocation; - guint border_width; - - gtk_widget_get_allocation (widget, &allocation); - border_width = gtk_container_get_border_width (GTK_CONTAINER (viewport)); - - view_allocation->x = 0; - view_allocation->y = 0; - - if (priv->shadow_type != GTK_SHADOW_NONE) - { - style = gtk_widget_get_style (widget); - view_allocation->x = style->xthickness; - view_allocation->y = style->ythickness; - } - - view_allocation->width = MAX (1, allocation.width - view_allocation->x * 2 - border_width * 2); - view_allocation->height = MAX (1, allocation.height - view_allocation->y * 2 - border_width * 2); -} - -static void -viewport_reclamp_adjustment (GtkAdjustment *adjustment, - gboolean *value_changed) -{ - gdouble value = adjustment->value; - - value = CLAMP (value, 0, adjustment->upper - adjustment->page_size); - if (value != adjustment->value) - { - adjustment->value = value; - if (value_changed) - *value_changed = TRUE; - } - else if (value_changed) - *value_changed = FALSE; -} - -static void -viewport_set_hadjustment_values (GtkViewport *viewport, - gboolean *value_changed) +viewport_set_hadjustment_values (GtkViewport *viewport) { GtkBin *bin = GTK_BIN (viewport); GtkAllocation view_allocation; - GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport); + GtkAdjustment *hadjustment = viewport->priv->hadjustment; GtkWidget *child; - gdouble old_page_size; - gdouble old_upper; - gdouble old_value; + gdouble upper, value; viewport_get_view_allocation (viewport, &view_allocation); - old_page_size = hadjustment->page_size; - old_upper = hadjustment->upper; - old_value = hadjustment->value; - hadjustment->page_size = view_allocation.width; - hadjustment->step_increment = view_allocation.width * 0.1; - hadjustment->page_increment = view_allocation.width * 0.9; - - hadjustment->lower = 0; - child = gtk_bin_get_child (bin); if (child && gtk_widget_get_visible (child)) { - gint minimum_width; + gint minimum_width, natural_width; + gint scroll_height; + + if (viewport->priv->vscroll_policy == GTK_SCROLL_MINIMUM) + gtk_widget_get_preferred_height (child, &scroll_height, NULL); + else + gtk_widget_get_preferred_height (child, NULL, &scroll_height); - gtk_size_request_get_width_for_height (GTK_SIZE_REQUEST (child), - view_allocation.height, - &minimum_width, - NULL); - hadjustment->upper = MAX (minimum_width, view_allocation.width); + gtk_widget_get_preferred_width_for_height (child, + MAX (view_allocation.height, scroll_height), + &minimum_width, + &natural_width); + + if (viewport->priv->hscroll_policy == GTK_SCROLL_MINIMUM) + upper = MAX (minimum_width, view_allocation.width); + else + upper = MAX (natural_width, view_allocation.width); } else - hadjustment->upper = view_allocation.width; + upper = view_allocation.width; - if (gtk_widget_get_direction (GTK_WIDGET (viewport)) == GTK_TEXT_DIR_RTL) + value = gtk_adjustment_get_value (hadjustment); + /* We clamp to the left in RTL mode */ + if (gtk_widget_get_direction (GTK_WIDGET (viewport)) == GTK_TEXT_DIR_RTL) { - gdouble dist = old_upper - (old_value + old_page_size); - hadjustment->value = hadjustment->upper - dist - hadjustment->page_size; - viewport_reclamp_adjustment (hadjustment, value_changed); - *value_changed = (old_value != hadjustment->value); + gdouble dist = gtk_adjustment_get_upper (hadjustment) + - value + - gtk_adjustment_get_page_size (hadjustment); + value = upper - dist - view_allocation.width; } - else - viewport_reclamp_adjustment (hadjustment, value_changed); + + gtk_adjustment_configure (hadjustment, + value, + 0, + upper, + view_allocation.width * 0.1, + view_allocation.width * 0.9, + view_allocation.width); } static void -viewport_set_vadjustment_values (GtkViewport *viewport, - gboolean *value_changed) +viewport_set_vadjustment_values (GtkViewport *viewport) { GtkBin *bin = GTK_BIN (viewport); GtkAllocation view_allocation; - GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport); + GtkAdjustment *vadjustment = viewport->priv->vadjustment; GtkWidget *child; + gdouble upper; viewport_get_view_allocation (viewport, &view_allocation); - vadjustment->page_size = view_allocation.height; - vadjustment->step_increment = view_allocation.height * 0.1; - vadjustment->page_increment = view_allocation.height * 0.9; - - vadjustment->lower = 0; - child = gtk_bin_get_child (bin); if (child && gtk_widget_get_visible (child)) { - gint minimum_height; + gint minimum_height, natural_height; + gint scroll_width; - gtk_size_request_get_height_for_width (GTK_SIZE_REQUEST (child), - view_allocation.width, - &minimum_height, - NULL); + if (viewport->priv->hscroll_policy == GTK_SCROLL_MINIMUM) + gtk_widget_get_preferred_width (child, &scroll_width, NULL); + else + gtk_widget_get_preferred_width (child, NULL, &scroll_width); + + gtk_widget_get_preferred_height_for_width (child, + MAX (view_allocation.width, scroll_width), + &minimum_height, + &natural_height); - vadjustment->upper = MAX (minimum_height, view_allocation.height); + if (viewport->priv->vscroll_policy == GTK_SCROLL_MINIMUM) + upper = MAX (minimum_height, view_allocation.height); + else + upper = MAX (natural_height, view_allocation.height); } else - vadjustment->upper = view_allocation.height; + upper = view_allocation.height; - viewport_reclamp_adjustment (vadjustment, value_changed); + gtk_adjustment_configure (vadjustment, + gtk_adjustment_get_value (vadjustment), + 0, + upper, + view_allocation.height * 0.1, + view_allocation.height * 0.9, + view_allocation.height); } static void @@ -506,33 +492,26 @@ viewport_set_adjustment (GtkViewport *viewport, GtkAdjustment *adjustment) { GtkAdjustment **adjustmentp = ADJUSTMENT_POINTER (viewport, orientation); - gboolean value_changed; if (adjustment && adjustment == *adjustmentp) return; if (!adjustment) - adjustment = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, - 0.0, 0.0, 0.0)); + adjustment = gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0); viewport_disconnect_adjustment (viewport, orientation); *adjustmentp = adjustment; g_object_ref_sink (adjustment); if (orientation == GTK_ORIENTATION_HORIZONTAL) - viewport_set_hadjustment_values (viewport, &value_changed); + viewport_set_hadjustment_values (viewport); else - viewport_set_vadjustment_values (viewport, &value_changed); + viewport_set_vadjustment_values (viewport); g_signal_connect (adjustment, "value-changed", G_CALLBACK (gtk_viewport_adjustment_value_changed), viewport); - gtk_adjustment_changed (adjustment); - - if (value_changed) - gtk_adjustment_value_changed (adjustment); - else - gtk_viewport_adjustment_value_changed (adjustment, viewport); + gtk_viewport_adjustment_value_changed (adjustment, viewport); } /** @@ -541,6 +520,8 @@ viewport_set_adjustment (GtkViewport *viewport, * @adjustment: (allow-none): a #GtkAdjustment. * * Sets the horizontal adjustment of the viewport. + * + * Deprecated: 3.0: Use gtk_scrollable_set_hadjustment() **/ void gtk_viewport_set_hadjustment (GtkViewport *viewport, @@ -561,6 +542,8 @@ gtk_viewport_set_hadjustment (GtkViewport *viewport, * @adjustment: (allow-none): a #GtkAdjustment. * * Sets the vertical adjustment of the viewport. + * + * Deprecated: 3.0: Use gtk_scrollable_set_vadjustment() **/ void gtk_viewport_set_vadjustment (GtkViewport *viewport, @@ -575,15 +558,6 @@ gtk_viewport_set_vadjustment (GtkViewport *viewport, g_object_notify (G_OBJECT (viewport), "vadjustment"); } -static void -gtk_viewport_set_scroll_adjustments (GtkViewport *viewport, - GtkAdjustment *hadjustment, - GtkAdjustment *vadjustment) -{ - gtk_viewport_set_hadjustment (viewport, hadjustment); - gtk_viewport_set_vadjustment (viewport, vadjustment); -} - /** * gtk_viewport_set_shadow_type: * @viewport: a #GtkViewport. @@ -679,11 +653,11 @@ gtk_viewport_realize (GtkWidget *widget) GtkViewport *viewport = GTK_VIEWPORT (widget); GtkViewportPrivate *priv = viewport->priv; GtkBin *bin = GTK_BIN (widget); - GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport); - GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport); + GtkAdjustment *hadjustment = priv->hadjustment; + GtkAdjustment *vadjustment = priv->vadjustment; GtkAllocation allocation; GtkAllocation view_allocation; - GtkStyle *style; + GtkStyleContext *context; GtkWidget *child; GdkWindow *window; GdkWindowAttr attributes; @@ -729,10 +703,10 @@ gtk_viewport_realize (GtkWidget *widget) &attributes, attributes_mask); gdk_window_set_user_data (priv->view_window, viewport); - attributes.x = - hadjustment->value; - attributes.y = - vadjustment->value; - attributes.width = hadjustment->upper; - attributes.height = vadjustment->upper; + attributes.x = - gtk_adjustment_get_value (hadjustment); + attributes.y = - gtk_adjustment_get_value (vadjustment); + attributes.width = gtk_adjustment_get_upper (hadjustment); + attributes.height = gtk_adjustment_get_upper (vadjustment); attributes.event_mask = event_mask; @@ -743,10 +717,9 @@ gtk_viewport_realize (GtkWidget *widget) if (child) gtk_widget_set_parent_window (child, priv->bin_window); - gtk_widget_style_attach (widget); - style = gtk_widget_get_style (widget); - gtk_style_set_background (style, window, GTK_STATE_NORMAL); - gtk_style_set_background (style, priv->bin_window, GTK_STATE_NORMAL); + context = gtk_widget_get_style_context (widget); + gtk_style_context_set_background (context, window); + gtk_style_context_set_background (context, priv->bin_window); gdk_window_show (priv->bin_window); gdk_window_show (priv->view_window); @@ -770,32 +743,52 @@ gtk_viewport_unrealize (GtkWidget *widget) } static gint -gtk_viewport_expose (GtkWidget *widget, - GdkEventExpose *event) +gtk_viewport_draw (GtkWidget *widget, + cairo_t *cr) { - if (gtk_widget_is_drawable (widget)) + GtkViewport *viewport = GTK_VIEWPORT (widget); + GtkViewportPrivate *priv = viewport->priv; + GtkStyleContext *context; + int x, y; + + context = gtk_widget_get_style_context (widget); + + if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)) && + priv->shadow_type != GTK_SHADOW_NONE) { - GtkViewport *viewport = GTK_VIEWPORT (widget); - GtkViewportPrivate *priv = viewport->priv; - - if (event->window == gtk_widget_get_window (widget)) - { - gtk_paint_shadow (gtk_widget_get_style (widget), - gtk_widget_get_window (widget), - GTK_STATE_NORMAL, priv->shadow_type, - &event->area, widget, "viewport", - 0, 0, -1, -1); - } - - if (event->window == priv->bin_window) - { - gtk_paint_flat_box(gtk_widget_get_style (widget), priv->bin_window, - GTK_STATE_NORMAL, GTK_SHADOW_NONE, - &event->area, widget, "viewportbin", - 0, 0, -1, -1); + gtk_style_context_save (context); + gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME); - GTK_WIDGET_CLASS (gtk_viewport_parent_class)->expose_event (widget, event); - } + gtk_render_frame (context, cr, 0, 0, + gdk_window_get_width (gtk_widget_get_window (widget)), + gdk_window_get_height (gtk_widget_get_window (widget))); + + gtk_style_context_restore (context); + } + + if (gtk_cairo_should_draw_window (cr, priv->view_window)) + { + /* This is a cute hack to ensure the contents of bin_window are + * restricted to where they are visible. We only need to do this + * clipping when called via gtk_widget_draw() and not in expose + * events. And when that happens every window (including this one) + * should be drawn. + */ + gdk_window_get_position (priv->view_window, &x, &y); + cairo_rectangle (cr, x, y, + gdk_window_get_width (priv->view_window), + gdk_window_get_height (priv->view_window)); + cairo_clip (cr); + } + + if (gtk_cairo_should_draw_window (cr, priv->bin_window)) + { + gdk_window_get_position (priv->bin_window, &x, &y); + gtk_render_background (context, cr, x, y, + gdk_window_get_width (priv->bin_window), + gdk_window_get_height (priv->bin_window)); + + GTK_WIDGET_CLASS (gtk_viewport_parent_class)->draw (widget, cr); } return FALSE; @@ -825,9 +818,8 @@ gtk_viewport_size_allocate (GtkWidget *widget, GtkViewportPrivate *priv = viewport->priv; GtkBin *bin = GTK_BIN (widget); guint border_width; - gboolean hadjustment_value_changed, vadjustment_value_changed; - GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport); - GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport); + GtkAdjustment *hadjustment = priv->hadjustment; + GtkAdjustment *vadjustment = priv->vadjustment; GtkAllocation child_allocation; GtkWidget *child; @@ -845,13 +837,16 @@ gtk_viewport_size_allocate (GtkWidget *widget, gtk_widget_set_allocation (widget, allocation); - viewport_set_hadjustment_values (viewport, &hadjustment_value_changed); - viewport_set_vadjustment_values (viewport, &vadjustment_value_changed); + g_object_freeze_notify (G_OBJECT (hadjustment)); + g_object_freeze_notify (G_OBJECT (vadjustment)); + + viewport_set_hadjustment_values (viewport); + viewport_set_vadjustment_values (viewport); child_allocation.x = 0; child_allocation.y = 0; - child_allocation.width = hadjustment->upper; - child_allocation.height = vadjustment->upper; + child_allocation.width = gtk_adjustment_get_upper (hadjustment); + child_allocation.height = gtk_adjustment_get_upper (vadjustment); if (gtk_widget_get_realized (widget)) { GtkAllocation view_allocation; @@ -869,8 +864,8 @@ gtk_viewport_size_allocate (GtkWidget *widget, view_allocation.width, view_allocation.height); gdk_window_move_resize (priv->bin_window, - - hadjustment->value, - - vadjustment->value, + - gtk_adjustment_get_value (hadjustment), + - gtk_adjustment_get_value (vadjustment), child_allocation.width, child_allocation.height); } @@ -879,12 +874,8 @@ gtk_viewport_size_allocate (GtkWidget *widget, if (child && gtk_widget_get_visible (child)) gtk_widget_size_allocate (child, &child_allocation); - gtk_adjustment_changed (hadjustment); - gtk_adjustment_changed (vadjustment); - if (hadjustment_value_changed) - gtk_adjustment_value_changed (hadjustment); - if (vadjustment_value_changed) - gtk_adjustment_value_changed (vadjustment); + g_object_thaw_notify (G_OBJECT (hadjustment)); + g_object_thaw_notify (G_OBJECT (vadjustment)); } static void @@ -900,14 +891,14 @@ gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment, if (child && gtk_widget_get_visible (child) && gtk_widget_get_realized (GTK_WIDGET (viewport))) { - GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport); - GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport); + GtkAdjustment *hadjustment = priv->hadjustment; + GtkAdjustment *vadjustment = priv->vadjustment; gint old_x, old_y; gint new_x, new_y; gdk_window_get_position (priv->bin_window, &old_x, &old_y); - new_x = - hadjustment->value; - new_y = - vadjustment->value; + new_x = - gtk_adjustment_get_value (hadjustment); + new_y = - gtk_adjustment_get_value (vadjustment); if (new_x != old_x || new_y != old_y) { @@ -918,41 +909,35 @@ gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment, } static void -gtk_viewport_style_set (GtkWidget *widget, - GtkStyle *previous_style) +gtk_viewport_style_updated (GtkWidget *widget) { + GTK_WIDGET_CLASS (gtk_viewport_parent_class)->style_updated (widget); + if (gtk_widget_get_realized (widget) && gtk_widget_get_has_window (widget)) { - GtkStyle *style; - GtkViewport *viewport = GTK_VIEWPORT (widget); + GtkStyleContext *context; + GtkViewport *viewport = GTK_VIEWPORT (widget); GtkViewportPrivate *priv = viewport->priv; - style = gtk_widget_get_style (widget); - gtk_style_set_background (style, priv->bin_window, GTK_STATE_NORMAL); - gtk_style_set_background (style, - gtk_widget_get_window (widget), - gtk_widget_get_state (widget)); + context = gtk_widget_get_style_context (widget); + gtk_style_context_set_background (context, priv->bin_window); + gtk_style_context_set_background (context, gtk_widget_get_window (widget)); } } static void -gtk_viewport_size_request_init (GtkSizeRequestIface *iface) -{ - iface->get_width = gtk_viewport_get_width; - iface->get_height = gtk_viewport_get_height; -} - -static void -gtk_viewport_get_size (GtkSizeRequest *widget, - GtkOrientation orientation, - gint *minimum_size, - gint *natural_size) +gtk_viewport_get_preferred_size (GtkWidget *widget, + GtkOrientation orientation, + gint *minimum_size, + gint *natural_size) { GtkViewport *viewport = GTK_VIEWPORT (widget); GtkViewportPrivate *priv = viewport->priv; - GtkStyle *style; + GtkStyleContext *context; + GtkStateFlags state; + GtkBorder padding, border; GtkWidget *child; gint child_min, child_nat; gint minimum, natural; @@ -964,23 +949,33 @@ gtk_viewport_get_size (GtkSizeRequest *widget, */ minimum = gtk_container_get_border_width (GTK_CONTAINER (widget)); + context = gtk_widget_get_style_context (GTK_WIDGET (widget)); + state = gtk_widget_get_state_flags (GTK_WIDGET (widget)); + gtk_style_context_get_padding (context, state, &padding); + if (priv->shadow_type != GTK_SHADOW_NONE) { - style = gtk_widget_get_style (GTK_WIDGET (widget)); + gtk_style_context_get_border (context, state, &border); + if (orientation == GTK_ORIENTATION_HORIZONTAL) - minimum += 2 * style->xthickness; + minimum += border.left + border.right; else - minimum += 2 * style->ythickness; + minimum += border.top + border.bottom; } + if (orientation == GTK_ORIENTATION_HORIZONTAL) + minimum += padding.left + padding.right; + else + minimum += padding.top + padding.bottom; + natural = minimum; if (child && gtk_widget_get_visible (child)) { if (orientation == GTK_ORIENTATION_HORIZONTAL) - gtk_size_request_get_width (GTK_SIZE_REQUEST (child), &child_min, &child_nat); + gtk_widget_get_preferred_width (child, &child_min, &child_nat); else - gtk_size_request_get_height (GTK_SIZE_REQUEST (child), &child_min, &child_nat); + gtk_widget_get_preferred_height (child, &child_min, &child_nat); minimum += child_min; natural += child_nat; @@ -994,17 +989,17 @@ gtk_viewport_get_size (GtkSizeRequest *widget, } static void -gtk_viewport_get_width (GtkSizeRequest *widget, - gint *minimum_size, - gint *natural_size) +gtk_viewport_get_preferred_width (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) { - gtk_viewport_get_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size); + gtk_viewport_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size); } static void -gtk_viewport_get_height (GtkSizeRequest *widget, - gint *minimum_size, - gint *natural_size) +gtk_viewport_get_preferred_height (GtkWidget *widget, + gint *minimum_size, + gint *natural_size) { - gtk_viewport_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size); + gtk_viewport_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size); }