X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=hildon%2Fhildon-pannable-area.c;h=d6b3f39ab5af4282c6228357c2b47aa84211619c;hb=31546ef62cf4b0841de187356e915a37b7a3a097;hp=85a2e2135c9787faba44685052ccc9aadec7c75d;hpb=3abadbe116c07a2876f90809f82e8f2e17876732;p=hildon diff --git a/hildon/hildon-pannable-area.c b/hildon/hildon-pannable-area.c index 85a2e21..d6b3f39 100644 --- a/hildon/hildon-pannable-area.c +++ b/hildon/hildon-pannable-area.c @@ -141,12 +141,18 @@ struct _HildonPannableAreaPrivate { GtkPolicyType hscrollbar_policy; GdkGC *scrollbars_gc; + GdkColor scroll_color; + + gboolean center_on_child_focus; + gboolean center_on_child_focus_pending; }; /*signals*/ enum { HORIZONTAL_MOVEMENT, VERTICAL_MOVEMENT, + PANNING_STARTED, + PANNING_FINISHED, LAST_SIGNAL }; @@ -178,6 +184,7 @@ enum { PROP_SIZE_REQUEST_POLICY, PROP_HADJUSTMENT, PROP_VADJUSTMENT, + PROP_CENTER_ON_CHILD_FOCUS, PROP_LAST }; @@ -289,6 +296,9 @@ static void hildon_pannable_area_child_mapped (GtkWidget *widget, static void hildon_pannable_area_add (GtkContainer *container, GtkWidget *child); static void hildon_pannable_area_remove (GtkContainer *container, GtkWidget *child); static void hildon_pannable_calculate_vel_factor (HildonPannableArea * self); +static void hildon_pannable_area_set_focus_child (GtkContainer *container, + GtkWidget *child); +static void hildon_pannable_area_center_on_child_focus (HildonPannableArea *area); static void @@ -321,6 +331,7 @@ hildon_pannable_area_class_init (HildonPannableAreaClass * klass) container_class->add = hildon_pannable_area_add; container_class->remove = hildon_pannable_area_remove; + container_class->set_focus_child = hildon_pannable_area_set_focus_child; klass->horizontal_movement = NULL; klass->vertical_movement = NULL; @@ -569,6 +580,16 @@ hildon_pannable_area_class_init (HildonPannableAreaClass * klass) GTK_TYPE_ADJUSTMENT, G_PARAM_READABLE)); + g_object_class_install_property (object_class, + PROP_CENTER_ON_CHILD_FOCUS, + g_param_spec_boolean ("center-on-child-focus", + "Center on the child with the focus", + "Whether to center the pannable on the child that receives the focus.", + FALSE, + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); + + gtk_widget_class_install_style_property (widget_class, g_param_spec_uint ("indicator-width", @@ -629,6 +650,52 @@ hildon_pannable_area_class_init (HildonPannableAreaClass * klass) G_TYPE_DOUBLE, G_TYPE_DOUBLE); + /** + * HildonPannableArea::panning-started: + * @hildonpannable: the pannable area object that is going to start + * the panning + * + * This signal is emitted before the panning starts. Applications + * can return %TRUE to avoid the panning. The main difference with + * the vertical-movement and horizontal-movement signals is those + * gesture signals are launched no matter if the widget is going to + * move, this signal means the widget is going to start moving. It + * could even happen that the widget moves and there was no gesture + * (i.e. click meanwhile the pannable is overshooting). + * + * Returns: %TRUE to stop the panning launch. %FALSE to continue + * with it. + * + * Since: 2.2 + */ + pannable_area_signals[PANNING_STARTED] = + g_signal_new ("panning-started", + G_TYPE_FROM_CLASS (object_class), + 0, + 0, + NULL, NULL, + _hildon_marshal_BOOLEAN__VOID, + G_TYPE_BOOLEAN, 0); + + /** + * HildonPannableArea::panning-finished: + * @hildonpannable: the pannable area object that finished the + * panning + * + * This signal is emitted after the kinetic panning has + * finished. + * + * Since: 2.2 + */ + pannable_area_signals[PANNING_FINISHED] = + g_signal_new ("panning-finished", + G_TYPE_FROM_CLASS (object_class), + 0, + 0, + NULL, NULL, + _hildon_marshal_VOID__VOID, + G_TYPE_NONE, 0); + } static void @@ -669,8 +736,10 @@ hildon_pannable_area_init (HildonPannableArea * area) priv->last_in = TRUE; priv->x_offset = 0; priv->y_offset = 0; + priv->center_on_child_focus_pending = FALSE; - gtk_widget_add_events (GTK_WIDGET (area), GDK_POINTER_MOTION_HINT_MASK); + gtk_style_lookup_color (GTK_WIDGET (area)->style, + "SecondaryTextColor", &priv->scroll_color); priv->hadjust = GTK_ADJUSTMENT (gtk_adjustment_new (0.0, 0.0, 0.0, 0.0, 0.0, 0.0)); @@ -781,6 +850,9 @@ hildon_pannable_area_get_property (GObject * object, hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (object))); break; + case PROP_CENTER_ON_CHILD_FOCUS: + g_value_set_boolean (value, priv->center_on_child_focus); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); } @@ -896,6 +968,9 @@ hildon_pannable_area_set_property (GObject * object, hildon_pannable_area_set_size_request_policy (HILDON_PANNABLE_AREA (object), g_value_get_enum (value)); break; + case PROP_CENTER_ON_CHILD_FOCUS: + priv->center_on_child_focus = g_value_get_boolean (value); + break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec); @@ -909,6 +984,7 @@ hildon_pannable_area_dispose (GObject * object) GtkWidget *child = gtk_bin_get_child (GTK_BIN (object)); if (priv->idle_id) { + g_signal_emit (object, pannable_area_signals[PANNING_FINISHED], 0); g_source_remove (priv->idle_id); priv->idle_id = 0; } @@ -999,6 +1075,7 @@ hildon_pannable_area_realize (GtkWidget * widget) | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_SCROLL_MASK + | GDK_POINTER_MOTION_HINT_MASK | GDK_EXPOSURE_MASK | GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK; attributes.wclass = GDK_INPUT_ONLY; @@ -1193,6 +1270,7 @@ hildon_pannable_area_style_set (GtkWidget * widget, GTK_WIDGET_CLASS (hildon_pannable_area_parent_class)-> style_set (widget, previous_style); + gtk_style_lookup_color (widget->style, "SecondaryTextColor", &priv->scroll_color); gtk_widget_style_get (widget, "indicator-width", &priv->indicator_width, NULL); } @@ -1413,7 +1491,7 @@ hildon_pannable_draw_vscroll (GtkWidget *widget, HildonPannableAreaPrivate *priv = HILDON_PANNABLE_AREA (widget)->priv; gfloat y, height; GdkColor transp_color; - GdkGC *gc = widget->style->fg_gc[GTK_STATE_INSENSITIVE]; + GdkGC *gc = priv->scrollbars_gc; gdk_draw_rectangle (widget->window, widget->style->bg_gc[GTK_STATE_NORMAL], @@ -1437,14 +1515,13 @@ hildon_pannable_draw_vscroll (GtkWidget *widget, (priv->hscroll_visible ? priv->hscroll_rect.height : 0) - height); - if (priv->scroll_indicator_alpha < 1.0) { + if (priv->scroll_indicator_alpha == 1.0) { + transp_color = priv->scroll_color; + } else if (priv->scroll_indicator_alpha < 1.0) { tranparency_color (&transp_color, *back_color, *scroll_color, priv->scroll_indicator_alpha); - - gdk_gc_set_rgb_fg_color (priv->scrollbars_gc, &transp_color); - - gc = priv->scrollbars_gc; } + gdk_gc_set_rgb_fg_color (gc, &transp_color); gdk_draw_rectangle (widget->window, gc, TRUE, priv->vscroll_rect.x, y, @@ -1459,7 +1536,7 @@ hildon_pannable_draw_hscroll (GtkWidget *widget, HildonPannableAreaPrivate *priv = HILDON_PANNABLE_AREA (widget)->priv; gfloat x, width; GdkColor transp_color; - GdkGC *gc = widget->style->fg_gc[GTK_STATE_INSENSITIVE]; + GdkGC *gc = priv->scrollbars_gc; gdk_draw_rectangle (widget->window, widget->style->bg_gc[GTK_STATE_INSENSITIVE], @@ -1484,14 +1561,13 @@ hildon_pannable_draw_hscroll (GtkWidget *widget, (priv->vscroll_visible ? priv->vscroll_rect.width : 0) - width); - if (priv->scroll_indicator_alpha < 1.0) { + if (priv->scroll_indicator_alpha == 1.0) { + transp_color = priv->scroll_color; + } else if (priv->scroll_indicator_alpha < 1.0) { tranparency_color (&transp_color, *back_color, *scroll_color, priv->scroll_indicator_alpha); - - gdk_gc_set_rgb_fg_color (priv->scrollbars_gc, &transp_color); - - gc = priv->scrollbars_gc; } + gdk_gc_set_rgb_fg_color (gc, &transp_color); gdk_draw_rectangle (widget->window, gc, TRUE, x, priv->hscroll_rect.y, width, @@ -1647,7 +1723,7 @@ hildon_pannable_area_expose_event (GtkWidget * widget, GdkColor scroll_color = widget->style->base[GTK_STATE_SELECTED]; #else /* USE_CAIRO_SCROLLBARS */ GdkColor back_color = widget->style->bg[GTK_STATE_NORMAL]; - GdkColor scroll_color = widget->style->fg[GTK_STATE_INSENSITIVE]; + GdkColor scroll_color = priv->scroll_color; #endif if (G_UNLIKELY (priv->initial_effect)) { @@ -1843,7 +1919,8 @@ hildon_pannable_area_button_press_cb (GtkWidget * widget, GdkEventButton * event) { gint x, y; - HildonPannableAreaPrivate *priv = HILDON_PANNABLE_AREA (widget)->priv; + HildonPannableArea *area = HILDON_PANNABLE_AREA (widget); + HildonPannableAreaPrivate *priv = area->priv; if ((!priv->enabled) || (event->button != 1) || ((event->time == priv->last_time) && @@ -1852,7 +1929,7 @@ hildon_pannable_area_button_press_cb (GtkWidget * widget, priv->scroll_indicator_event_interrupt = 1; - hildon_pannable_area_launch_fade_timeout (HILDON_PANNABLE_AREA (widget), + hildon_pannable_area_launch_fade_timeout (area, priv->scroll_indicator_alpha); priv->last_time = event->time; @@ -1886,6 +1963,11 @@ hildon_pannable_area_button_press_cb (GtkWidget * widget, /* Stop scrolling on mouse-down (so you can flick, then hold to stop) */ priv->vel_x = 0; priv->vel_y = 0; + if (priv->idle_id) { + g_source_remove (priv->idle_id); + priv->idle_id = 0; + g_signal_emit (area, pannable_area_signals[PANNING_FINISHED], 0); + } if (priv->child) { @@ -2200,6 +2282,7 @@ hildon_pannable_area_timeout (HildonPannableArea * area) if ((!priv->enabled) || (priv->mode == HILDON_PANNABLE_AREA_MODE_PUSH)) { priv->idle_id = 0; + g_signal_emit (area, pannable_area_signals[PANNING_FINISHED], 0); return FALSE; } @@ -2236,6 +2319,8 @@ hildon_pannable_area_timeout (HildonPannableArea * area) priv->vel_y = 0; priv->idle_id = 0; + g_signal_emit (area, pannable_area_signals[PANNING_FINISHED], 0); + return FALSE; } } @@ -2392,6 +2477,16 @@ hildon_pannable_area_check_move (HildonPannableArea *area, synth_crossing (priv->child, pos_x, pos_y, event->x_root, event->y_root, event->time, FALSE); } + + if (priv->moved) { + gboolean result_val; + + g_signal_emit (area, + pannable_area_signals[PANNING_STARTED], + 0, &result_val); + + priv->moved = !result_val; + } } priv->first_drag = FALSE; @@ -2400,10 +2495,10 @@ hildon_pannable_area_check_move (HildonPannableArea *area, (priv->mode != HILDON_PANNABLE_AREA_MODE_AUTO)) { if (!priv->idle_id) - priv->idle_id = gdk_threads_add_timeout ((gint) - (1000.0 / (gdouble) priv->sps), - (GSourceFunc) - hildon_pannable_area_timeout, area); + priv->idle_id = gdk_threads_add_timeout_full (GDK_PRIORITY_EVENTS-10, + (guint)(1000.0 / (gdouble) priv->sps), + (GSourceFunc)hildon_pannable_area_timeout, + area, NULL); } } } @@ -2631,6 +2726,15 @@ hildon_pannable_area_button_release_cb (GtkWidget * widget, if ((ABS (priv->vel_y) >= priv->vmin) || (ABS (priv->vel_x) >= priv->vmin)) { + /* we have to move because we are in overshooting position*/ + if (!priv->moved) { + gboolean result_val; + + g_signal_emit (area, + pannable_area_signals[PANNING_STARTED], + 0, &result_val); + } + priv->scroll_indicator_alpha = 1.0; if (ABS (priv->vel_x) > MAX_SPEED_THRESHOLD) @@ -2640,11 +2744,21 @@ hildon_pannable_area_button_release_cb (GtkWidget * widget, priv->vel_y = (priv->vel_y > 0) ? priv->vmax : -priv->vmax; if (!priv->idle_id) - priv->idle_id = gdk_threads_add_timeout ((gint) (1000.0 / (gdouble) priv->sps), - (GSourceFunc) - hildon_pannable_area_timeout, widget); + priv->idle_id = gdk_threads_add_timeout_full (GDK_PRIORITY_EVENTS-10, + (guint)(1000.0 / (gdouble) priv->sps), + (GSourceFunc)hildon_pannable_area_timeout, + area, NULL); + } else { + if (priv->center_on_child_focus_pending) { + hildon_pannable_area_center_on_child_focus (area); + } + + if (priv->moved) + g_signal_emit (widget, pannable_area_signals[PANNING_FINISHED], 0); } + area->priv->center_on_child_focus_pending = FALSE; + priv->scroll_indicator_event_interrupt = 0; priv->scroll_delay_counter = priv->scrollbar_fade_delay; @@ -2729,6 +2843,8 @@ hildon_pannable_area_scroll_cb (GtkWidget *widget, gtk_widget_queue_resize (GTK_WIDGET (widget)); } + g_signal_emit (widget, pannable_area_signals[PANNING_FINISHED], 0); + g_source_remove (priv->idle_id); priv->idle_id = 0; } @@ -2788,6 +2904,39 @@ hildon_pannable_area_add (GtkContainer *container, GtkWidget *child) } } +/* call this function if you are not panning */ +static void +hildon_pannable_area_center_on_child_focus (HildonPannableArea *area) +{ + GtkWidget *focused_child = NULL; + GtkWidget *window = NULL; + + window = gtk_widget_get_toplevel (GTK_WIDGET (area)); + + if (GTK_WIDGET_TOPLEVEL (window)) { + focused_child = gtk_window_get_focus (GTK_WINDOW (window)); + } + + if (focused_child) { + hildon_pannable_area_scroll_to_child (area, focused_child); + } +} + +static void +hildon_pannable_area_set_focus_child (GtkContainer *container, + GtkWidget *child) +{ + HildonPannableArea *area = HILDON_PANNABLE_AREA (container); + + if (!area->priv->center_on_child_focus) { + return; + } + + if (GTK_IS_WIDGET (child)) { + area->priv->center_on_child_focus_pending = TRUE; + } +} + static void hildon_pannable_area_remove (GtkContainer *container, GtkWidget *child) { @@ -3043,9 +3192,10 @@ hildon_pannable_area_scroll_to (HildonPannableArea *area, hildon_pannable_area_launch_fade_timeout (area, 1.0); if (!priv->idle_id) - priv->idle_id = gdk_threads_add_timeout ((gint) (1000.0 / (gdouble) priv->sps), - (GSourceFunc) - hildon_pannable_area_timeout, area); + priv->idle_id = gdk_threads_add_timeout_full (GDK_PRIORITY_EVENTS-10, + (guint)(1000.0 / (gdouble) priv->sps), + (GSourceFunc)hildon_pannable_area_timeout, + area, NULL); } /** @@ -3137,6 +3287,7 @@ hildon_pannable_area_jump_to (HildonPannableArea *area, gtk_widget_queue_resize (GTK_WIDGET (area)); } + g_signal_emit (area, pannable_area_signals[PANNING_FINISHED], 0); g_source_remove (priv->idle_id); priv->idle_id = 0; } @@ -3373,3 +3524,44 @@ hildon_pannable_area_set_size_request_policy (HildonPannableArea *area, g_object_notify (G_OBJECT (area), "size-request-policy"); } +/** + * hildon_pannable_area_get_center_on_child_focus + * @area: A #HildonPannableArea + * + * Gets the @area #HildonPannableArea:center-on-child-focus property + * value. + * + * See #HildonPannableArea:center-on-child-focus for more information. + * + * Returns: the @area #HildonPannableArea:center-on-child-focus value + * + * Since: 2.2 + **/ +gboolean +hildon_pannable_area_get_center_on_child_focus (HildonPannableArea *area) +{ + g_return_val_if_fail (HILDON_IS_PANNABLE_AREA (area), FALSE); + + return area->priv->center_on_child_focus; +} + +/** + * hildon_pannable_area_set_center_on_child_focus + * @area: A #HildonPannableArea + * @value: the new value + * + * Sets the @area #HildonPannableArea:center-on-child-focus property + * to @value. + * + * See #HildonPannableArea:center-on-child-focus for more information. + * + * Since: 2.2 + **/ +void +hildon_pannable_area_set_center_on_child_focus (HildonPannableArea *area, + gboolean value) +{ + g_return_if_fail (HILDON_IS_PANNABLE_AREA (area)); + + area->priv->center_on_child_focus = value; +}