X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkscrolledwindow.c;h=99dab9ee94ca6e84a75914cf47d7d6e1a20eae15;hb=HEAD;hp=a18c4cf2b5a9dadee980f6b337ff634690a9fa1a;hpb=1a1361c4b335299384031fa2daee4215a145f07e;p=~andy%2Fgtk diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index a18c4cf2b..99dab9ee9 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -67,8 +67,8 @@ * If a widget has native scrolling abilities, it can be added to the * #GtkScrolledWindow with gtk_container_add(). If a widget does not, you * must first add the widget to a #GtkViewport, then add the #GtkViewport - * to the scrolled window. The convenience function - * gtk_scrolled_window_add_with_viewport() does exactly this, so you can + * to the scrolled window. gtk_container_add() will do this for you for + * widgets that don't implement #GtkScrollable natively, so you can * ignore the presence of the viewport. * * The position of the scrollbars is controlled by the scroll @@ -126,7 +126,6 @@ #define TOUCH_BYPASS_CAPTURED_THRESHOLD 30 /* Kinetic scrolling */ -#define FRAME_INTERVAL (1000 / 60) #define MAX_OVERSHOOT_DISTANCE 50 #define FRICTION_DECELERATION 0.003 #define OVERSHOOT_INVERSE_ACCELERATION 0.003 @@ -274,9 +273,6 @@ static void gtk_scrolled_window_realize (GtkWidget *wid static void gtk_scrolled_window_unrealize (GtkWidget *widget); static void gtk_scrolled_window_map (GtkWidget *widget); static void gtk_scrolled_window_unmap (GtkWidget *widget); -static void gtk_scrolled_window_state_flags_changed (GtkWidget *widget, - GtkStateFlags previous_state); -static void gtk_scrolled_window_style_updated (GtkWidget *widget); static void gtk_scrolled_window_grab_notify (GtkWidget *widget, gboolean was_grabbed); @@ -287,6 +283,8 @@ static gboolean _gtk_scrolled_window_set_adjustment_value (GtkScrolledWindo gboolean allow_overshooting, gboolean snap_to_border); +static void gtk_scrolled_window_cancel_deceleration (GtkScrolledWindow *scrolled_window); + static guint signals[LAST_SIGNAL] = {0}; G_DEFINE_TYPE (GtkScrolledWindow, gtk_scrolled_window, GTK_TYPE_BIN) @@ -352,8 +350,6 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class) widget_class->unrealize = gtk_scrolled_window_unrealize; widget_class->map = gtk_scrolled_window_map; widget_class->unmap = gtk_scrolled_window_unmap; - widget_class->state_flags_changed = gtk_scrolled_window_state_flags_changed; - widget_class->style_updated = gtk_scrolled_window_style_updated; widget_class->grab_notify = gtk_scrolled_window_grab_notify; container_class->add = gtk_scrolled_window_add; @@ -1984,14 +1980,23 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget, { gint child_scroll_width; gint child_scroll_height; + GtkScrollablePolicy hscroll_policy; + GtkScrollablePolicy vscroll_policy; gboolean previous_hvis; gboolean previous_vvis; guint count = 0; + hscroll_policy = GTK_IS_SCROLLABLE (child) + ? gtk_scrollable_get_hscroll_policy (GTK_SCROLLABLE (child)) + : GTK_SCROLL_MINIMUM; + vscroll_policy = GTK_IS_SCROLLABLE (child) + ? gtk_scrollable_get_vscroll_policy (GTK_SCROLLABLE (child)) + : GTK_SCROLL_MINIMUM; + /* Determine scrollbar visibility first via hfw apis */ if (gtk_widget_get_request_mode (child) == GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH) { - if (gtk_scrollable_get_hscroll_policy (GTK_SCROLLABLE (child)) == GTK_SCROLL_MINIMUM) + if (hscroll_policy == GTK_SCROLL_MINIMUM) gtk_widget_get_preferred_width (child, &child_scroll_width, NULL); else gtk_widget_get_preferred_width (child, NULL, &child_scroll_width); @@ -2000,7 +2005,7 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget, { /* First try without a vertical scrollbar if the content will fit the height * given the extra width of the scrollbar */ - if (gtk_scrollable_get_vscroll_policy (GTK_SCROLLABLE (child)) == GTK_SCROLL_MINIMUM) + if (vscroll_policy == GTK_SCROLL_MINIMUM) gtk_widget_get_preferred_height_for_width (child, MAX (allocation->width, child_scroll_width), &child_scroll_height, NULL); @@ -2052,7 +2057,7 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget, } else /* GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT */ { - if (gtk_scrollable_get_vscroll_policy (GTK_SCROLLABLE (child)) == GTK_SCROLL_MINIMUM) + if (vscroll_policy == GTK_SCROLL_MINIMUM) gtk_widget_get_preferred_height (child, &child_scroll_height, NULL); else gtk_widget_get_preferred_height (child, NULL, &child_scroll_height); @@ -2061,7 +2066,7 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget, { /* First try without a horizontal scrollbar if the content will fit the width * given the extra height of the scrollbar */ - if (gtk_scrollable_get_hscroll_policy (GTK_SCROLLABLE (child)) == GTK_SCROLL_MINIMUM) + if (hscroll_policy == GTK_SCROLL_MINIMUM) gtk_widget_get_preferred_width_for_height (child, MAX (allocation->height, child_scroll_height), &child_scroll_width, NULL); @@ -2164,11 +2169,9 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget, gtk_scrolled_window_relative_allocation (widget, &relative_allocation); } + gtk_widget_set_child_visible (priv->hscrollbar, priv->hscrollbar_visible); if (priv->hscrollbar_visible) { - if (!gtk_widget_get_visible (priv->hscrollbar)) - gtk_widget_show (priv->hscrollbar); - child_allocation.x = relative_allocation.x; if (priv->real_window_placement == GTK_CORNER_TOP_LEFT || priv->real_window_placement == GTK_CORNER_TOP_RIGHT) @@ -2200,14 +2203,10 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (priv->hscrollbar, &child_allocation); } - else if (gtk_widget_get_visible (priv->hscrollbar)) - gtk_widget_hide (priv->hscrollbar); + gtk_widget_set_child_visible (priv->vscrollbar, priv->vscrollbar_visible); if (priv->vscrollbar_visible) { - if (!gtk_widget_get_visible (priv->vscrollbar)) - gtk_widget_show (priv->vscrollbar); - if ((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL && (priv->real_window_placement == GTK_CORNER_TOP_RIGHT || priv->real_window_placement == GTK_CORNER_BOTTOM_RIGHT)) || @@ -2247,8 +2246,6 @@ gtk_scrolled_window_size_allocate (GtkWidget *widget, gtk_widget_size_allocate (priv->vscrollbar, &child_allocation); } - else if (gtk_widget_get_visible (priv->vscrollbar)) - gtk_widget_hide (priv->vscrollbar); _gtk_scrolled_window_allocate_overshoot_window (scrolled_window); } @@ -2388,7 +2385,9 @@ _gtk_scrolled_window_set_adjustment_value (GtkScrolledWindow *scrolled_window, } static gboolean -scrolled_window_deceleration_cb (gpointer user_data) +scrolled_window_deceleration_cb (GtkWidget *widdget, + GdkFrameClock *frame_clock, + gpointer user_data) { KineticScrollData *data = user_data; GtkScrolledWindow *scrolled_window = data->scrolled_window; @@ -2405,7 +2404,7 @@ scrolled_window_deceleration_cb (gpointer user_data) _gtk_scrolled_window_get_overshoot (scrolled_window, &old_overshoot_x, &old_overshoot_y); - current_time = g_get_monotonic_time (); + current_time = gdk_frame_clock_get_frame_time (frame_clock); elapsed = (current_time - data->last_deceleration_time) / 1000; data->last_deceleration_time = current_time; @@ -2497,14 +2496,11 @@ scrolled_window_deceleration_cb (gpointer user_data) _gtk_scrolled_window_allocate_overshoot_window (scrolled_window); } - if (overshoot_x != 0 || overshoot_y != 0 || - data->x_velocity != 0 || data->y_velocity != 0) - return TRUE; - else - { - priv->deceleration_id = 0; - return FALSE; - } + if (overshoot_x == 0 && overshoot_y == 0 && + data->x_velocity == 0 && data->y_velocity == 0) + gtk_scrolled_window_cancel_deceleration (scrolled_window); + + return G_SOURCE_CONTINUE; } static void @@ -2514,7 +2510,8 @@ gtk_scrolled_window_cancel_deceleration (GtkScrolledWindow *scrolled_window) if (priv->deceleration_id) { - g_source_remove (priv->deceleration_id); + gtk_widget_remove_tick_callback (GTK_WIDGET (scrolled_window), + priv->deceleration_id); priv->deceleration_id = 0; } } @@ -2523,12 +2520,15 @@ static void gtk_scrolled_window_start_deceleration (GtkScrolledWindow *scrolled_window) { GtkScrolledWindowPrivate *priv = scrolled_window->priv; + GdkFrameClock *frame_clock; KineticScrollData *data; gdouble angle; + frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (scrolled_window)); + data = g_new0 (KineticScrollData, 1); data->scrolled_window = scrolled_window; - data->last_deceleration_time = g_get_monotonic_time (); + data->last_deceleration_time = gdk_frame_clock_get_frame_time (frame_clock); data->x_velocity = priv->x_velocity; data->y_velocity = priv->y_velocity; @@ -2540,10 +2540,10 @@ gtk_scrolled_window_start_deceleration (GtkScrolledWindow *scrolled_window) data->vel_sine = sin (angle); scrolled_window->priv->deceleration_id = - gdk_threads_add_timeout_full (G_PRIORITY_DEFAULT, - FRAME_INTERVAL, + gtk_widget_add_tick_callback (GTK_WIDGET (scrolled_window), scrolled_window_deceleration_cb, - data, (GDestroyNotify) g_free); + data, + (GDestroyNotify) g_free); } static gboolean @@ -3036,7 +3036,7 @@ gtk_scrolled_window_add (GtkContainer *container, GtkScrolledWindowPrivate *priv; GtkScrolledWindow *scrolled_window; GtkBin *bin; - GtkWidget *child_widget; + GtkWidget *child_widget, *scrollable_child; GtkAdjustment *hadj, *vadj; bin = GTK_BIN (container); @@ -3046,20 +3046,27 @@ gtk_scrolled_window_add (GtkContainer *container, scrolled_window = GTK_SCROLLED_WINDOW (container); priv = scrolled_window->priv; + if (GTK_IS_SCROLLABLE (child)) + { + scrollable_child = child; + } + else + { + scrollable_child = gtk_viewport_new (NULL, NULL); + gtk_widget_show (scrollable_child); + gtk_container_add (GTK_CONTAINER (scrollable_child), child); + } + if (gtk_widget_get_realized (GTK_WIDGET (bin))) - gtk_widget_set_parent_window (child, priv->overshoot_window); + gtk_widget_set_parent_window (scrollable_child, priv->overshoot_window); - _gtk_bin_set_child (bin, child); - gtk_widget_set_parent (child, GTK_WIDGET (bin)); + _gtk_bin_set_child (bin, scrollable_child); + gtk_widget_set_parent (scrollable_child, GTK_WIDGET (bin)); hadj = gtk_range_get_adjustment (GTK_RANGE (priv->hscrollbar)); vadj = gtk_range_get_adjustment (GTK_RANGE (priv->vscrollbar)); - if (GTK_IS_SCROLLABLE (child)) - g_object_set (child, "hadjustment", hadj, "vadjustment", vadj, NULL); - else - g_warning ("gtk_scrolled_window_add(): cannot add non scrollable widget " - "use gtk_scrolled_window_add_with_viewport() instead"); + g_object_set (scrollable_child, "hadjustment", hadj, "vadjustment", vadj, NULL); } static void @@ -3097,6 +3104,9 @@ gtk_scrolled_window_remove (GtkContainer *container, * * A widget supports scrolling natively if it implements the * #GtkScrollable interface. + * + * Deprecated: 3.8: gtk_container_add() will now automatically add + * a #GtkViewport if the child doesn't implement #GtkScrollable. */ void gtk_scrolled_window_add_with_viewport (GtkScrolledWindow *scrolled_window, @@ -3379,15 +3389,14 @@ gtk_scrolled_window_realize (GtkWidget *widget) attributes.wclass = GDK_INPUT_OUTPUT; attributes.visual = gtk_widget_get_visual (widget); attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK | - GDK_BUTTON_MOTION_MASK | GDK_TOUCH_MASK; + GDK_BUTTON_MOTION_MASK | GDK_TOUCH_MASK | GDK_EXPOSURE_MASK; attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL; scrolled_window->priv->overshoot_window = gdk_window_new (gtk_widget_get_parent_window (widget), &attributes, attributes_mask); - - gdk_window_set_user_data (scrolled_window->priv->overshoot_window, widget); + gtk_widget_register_window (widget, scrolled_window->priv->overshoot_window); child_widget = gtk_bin_get_child (GTK_BIN (widget)); @@ -3403,7 +3412,7 @@ gtk_scrolled_window_unrealize (GtkWidget *widget) { GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget); - gdk_window_set_user_data (scrolled_window->priv->overshoot_window, NULL); + gtk_widget_unregister_window (widget, scrolled_window->priv->overshoot_window); gdk_window_destroy (scrolled_window->priv->overshoot_window); scrolled_window->priv->overshoot_window = NULL; @@ -3432,37 +3441,6 @@ gtk_scrolled_window_unmap (GtkWidget *widget) GTK_WIDGET_CLASS (gtk_scrolled_window_parent_class)->unmap (widget); } -static void -_gtk_scrolled_window_update_background (GtkScrolledWindow *scrolled_window) -{ - GtkWidget *widget = GTK_WIDGET (scrolled_window); - - if (gtk_widget_get_realized (widget)) - { - GtkStyleContext *context; - - context = gtk_widget_get_style_context (widget); - gtk_style_context_set_background (context, scrolled_window->priv->overshoot_window); - } -} - -static void -gtk_scrolled_window_state_flags_changed (GtkWidget *widget, - GtkStateFlags previous_state) -{ - _gtk_scrolled_window_update_background (GTK_SCROLLED_WINDOW (widget)); - gtk_widget_queue_draw (widget); -} - -static void -gtk_scrolled_window_style_updated (GtkWidget *widget) -{ - GTK_WIDGET_CLASS (gtk_scrolled_window_parent_class)->style_updated (widget); - - _gtk_scrolled_window_update_background (GTK_SCROLLED_WINDOW (widget)); - gtk_widget_queue_draw (widget); -} - static void gtk_scrolled_window_grab_notify (GtkWidget *widget, gboolean was_grabbed)