X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkviewport.c;h=0469c5bce43bc37809e29bdb281a7817f41503d6;hb=02e915273845b21af223e7e5e2425569afcf1b83;hp=09e9fd25384ec65f3a9fb781282dd23e90564021;hpb=6f3706ac28abb6e45f4aef9534daa3a6b435c2d0;p=~andy%2Fgtk diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c index 09e9fd253..0469c5bce 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 . */ /* @@ -28,11 +26,12 @@ #include "gtkviewport.h" +#include "gtkadjustment.h" #include "gtkintl.h" #include "gtkmarshalers.h" +#include "gtkprivate.h" #include "gtkscrollable.h" #include "gtktypebuiltins.h" -#include "gtkprivate.h" /** @@ -44,14 +43,15 @@ * 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 + * #GtkTreeView or #GtkIconView, it can be added to a #GtkScrolledWindow * with gtk_container_add(). If a widget does not, you must first add the * widget to a #GtkViewport, then add the viewport to the scrolled window. - * The convenience function gtk_scrolled_window_add_with_viewport() does - * exactly this, so you can ignore the presence of the viewport. + * gtk_container_add() does this automatically if a child that does not + * implement #GtkScrollable is added to a #GtkScrolledWindow, so you can + * ignore the presence of the viewport. * * The #GtkViewport will start scrolling content only if allocated less * than the child widget's minimum size in a given orientation. @@ -82,7 +82,6 @@ enum { }; -static void gtk_viewport_finalize (GObject *object); static void gtk_viewport_set_property (GObject *object, guint prop_id, const GValue *value, @@ -111,6 +110,9 @@ 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_SCROLLABLE, NULL)) @@ -126,7 +128,6 @@ gtk_viewport_class_init (GtkViewportClass *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; @@ -139,6 +140,8 @@ gtk_viewport_class_init (GtkViewportClass *class) widget_class->get_preferred_width = gtk_viewport_get_preferred_width; widget_class->get_preferred_height = gtk_viewport_get_preferred_height; + gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_VIEWPORT); + container_class->add = gtk_viewport_add; /* GtkScrollable implementation */ @@ -172,10 +175,10 @@ 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); @@ -239,24 +242,27 @@ gtk_viewport_init (GtkViewport *viewport) gtk_widget_set_has_window (GTK_WIDGET (viewport), TRUE); gtk_widget_set_redraw_on_allocate (GTK_WIDGET (viewport), FALSE); - gtk_container_set_resize_mode (GTK_CONTAINER (viewport), GTK_RESIZE_QUEUE); priv->shadow_type = GTK_SHADOW_IN; priv->view_window = NULL; 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: (allow-none): horizontal adjustment + * @vadjustment: (allow-none): vertical adjustment * - * Creates a new #GtkViewport with the given adjustments. + * Creates a new #GtkViewport with the given adjustments, or with default + * adjustments if none are given. * - **/ + * Returns: a new #GtkViewport + */ GtkWidget* gtk_viewport_new (GtkAdjustment *hadjustment, GtkAdjustment *vadjustment) @@ -291,17 +297,6 @@ viewport_disconnect_adjustment (GtkViewport *viewport, } } -static void -gtk_viewport_finalize (GObject *object) -{ - GtkViewport *viewport = GTK_VIEWPORT (object); - - viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_HORIZONTAL); - viewport_disconnect_adjustment (viewport, GTK_ORIENTATION_VERTICAL); - - G_OBJECT_CLASS (gtk_viewport_parent_class)->finalize (object); -} - static void gtk_viewport_destroy (GtkWidget *widget) { @@ -333,9 +328,14 @@ viewport_get_view_allocation (GtkViewport *viewport, 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; @@ -343,7 +343,7 @@ viewport_get_view_allocation (GtkViewport *viewport, } view_allocation->x += padding.left; - view_allocation->y += padding.right; + 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); @@ -367,16 +367,9 @@ viewport_get_view_allocation (GtkViewport *viewport, 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; } /** @@ -392,16 +385,9 @@ gtk_viewport_get_hadjustment (GtkViewport *viewport) 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 @@ -409,7 +395,7 @@ 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 upper, value; @@ -463,7 +449,7 @@ 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; @@ -669,8 +655,8 @@ 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; GtkStyleContext *context; @@ -696,16 +682,15 @@ gtk_viewport_realize (GtkWidget *widget) attributes.visual = gtk_widget_get_visual (widget); event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK; - /* We select on button_press_mask so that button 4-5 scrolls are trapped. - */ - attributes.event_mask = event_mask | GDK_BUTTON_PRESS_MASK; + + attributes.event_mask = event_mask | GDK_SCROLL_MASK | GDK_TOUCH_MASK | GDK_SMOOTH_SCROLL_MASK; attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask); gtk_widget_set_window (widget, window); - gdk_window_set_user_data (window, viewport); + gtk_widget_register_window (widget, window); viewport_get_view_allocation (viewport, &view_allocation); @@ -717,7 +702,7 @@ gtk_viewport_realize (GtkWidget *widget) priv->view_window = gdk_window_new (window, &attributes, attributes_mask); - gdk_window_set_user_data (priv->view_window, viewport); + gtk_widget_register_window (widget, priv->view_window); attributes.x = - gtk_adjustment_get_value (hadjustment); attributes.y = - gtk_adjustment_get_value (vadjustment); @@ -727,7 +712,7 @@ gtk_viewport_realize (GtkWidget *widget) attributes.event_mask = event_mask; priv->bin_window = gdk_window_new (priv->view_window, &attributes, attributes_mask); - gdk_window_set_user_data (priv->bin_window, viewport); + gtk_widget_register_window (widget, priv->bin_window); child = gtk_bin_get_child (bin); if (child) @@ -747,11 +732,11 @@ gtk_viewport_unrealize (GtkWidget *widget) GtkViewport *viewport = GTK_VIEWPORT (widget); GtkViewportPrivate *priv = viewport->priv; - gdk_window_set_user_data (priv->view_window, NULL); + gtk_widget_unregister_window (widget, priv->view_window); gdk_window_destroy (priv->view_window); priv->view_window = NULL; - gdk_window_set_user_data (priv->bin_window, NULL); + gtk_widget_unregister_window (widget, priv->bin_window); gdk_window_destroy (priv->bin_window); priv->bin_window = NULL; @@ -769,7 +754,8 @@ gtk_viewport_draw (GtkWidget *widget, context = gtk_widget_get_style_context (widget); - if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget))) + if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)) && + priv->shadow_type != GTK_SHADOW_NONE) { gtk_style_context_save (context); gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME); @@ -833,8 +819,8 @@ gtk_viewport_size_allocate (GtkWidget *widget, GtkViewportPrivate *priv = viewport->priv; GtkBin *bin = GTK_BIN (widget); guint border_width; - 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; @@ -906,8 +892,8 @@ 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; @@ -916,21 +902,20 @@ gtk_viewport_adjustment_value_changed (GtkAdjustment *adjustment, new_y = - gtk_adjustment_get_value (vadjustment); if (new_x != old_x || new_y != old_y) - { - gdk_window_move (priv->bin_window, new_x, new_y); - gdk_window_process_updates (priv->bin_window, TRUE); - } + gdk_window_move (priv->bin_window, new_x, new_y); } } static void 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)) { GtkStyleContext *context; - GtkViewport *viewport = GTK_VIEWPORT (widget); + GtkViewport *viewport = GTK_VIEWPORT (widget); GtkViewportPrivate *priv = viewport->priv; context = gtk_widget_get_style_context (widget);