← Back to branch summary

~timo-jyrinki/totem/ubuntu.addgrilo

« back to all changes in this revision

Viewing changes to src/totem-object.c

  • Committer: Package Import Robot
  • Author(s): Robert Ancell
  • Date: 2012-07-05 14:48:34 UTC
  • mfrom: (1.11.15)
  • Revision ID: package-import@ubuntu.com-20120705144834-qg163dg8f9f7eqt2
Tags: 3.4.3-0ubuntu1
* New upstream release
* debian/control:
  - Build with valac-0.16

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/totem-object.c
108
108
G_MODULE_EXPORT gboolean seek_slider_released_cb (GtkWidget *widget, GdkEventButton *event, TotemObject *totem);
109
109
G_MODULE_EXPORT void volume_button_value_changed_cb (GtkScaleButton *button, gdouble value, TotemObject *totem);
110
110
G_MODULE_EXPORT gboolean window_key_press_event_cb (GtkWidget *win, GdkEventKey *event, TotemObject *totem);
111
 
G_MODULE_EXPORT int window_scroll_event_cb (GtkWidget *win, GdkEventScroll *event, TotemObject *totem);
 
111
G_MODULE_EXPORT int window_scroll_event_cb (GtkWidget *win, GdkEvent *event, TotemObject *totem);
112
112
G_MODULE_EXPORT void main_pane_size_allocated (GtkWidget *main_pane, GtkAllocation *allocation, TotemObject *totem);
113
113
G_MODULE_EXPORT void fs_exit1_activate_cb (GtkButton *button, TotemObject *totem);
114
114
 
1695
1695
        gboolean retval = TRUE;
1696
1696
 
1697
1697
        if (totem->mrl != NULL) {
 
1698
                totem->seek_to = 0;
 
1699
                totem->seek_to_start = 0;
 
1700
 
1698
1701
                totem_save_position (totem);
1699
1702
                g_free (totem->mrl);
1700
1703
                totem->mrl = NULL;
3770
3773
}
3771
3774
 
3772
3775
static gboolean
3773
 
totem_action_handle_scroll (TotemObject *totem, GdkScrollDirection direction)
 
3776
totem_action_handle_scroll (TotemObject    *totem,
 
3777
                            const GdkEvent *event)
3774
3778
{
3775
3779
        gboolean retval = TRUE;
 
3780
        GdkEventScroll *sevent = (GdkEventScroll *) event;
 
3781
        GdkScrollDirection direction;
 
3782
 
 
3783
        direction = sevent->direction;
3776
3784
 
3777
3785
        if (totem_fullscreen_is_fullscreen (totem->fs) != FALSE)
3778
3786
                totem_fullscreen_show_popups (totem->fs, TRUE);
3779
3787
 
 
3788
        if (direction == GDK_SCROLL_SMOOTH) {
 
3789
                gdouble y;
 
3790
                gdk_event_get_scroll_deltas (event, NULL, &y);
 
3791
                direction = y >= 0.0 ? GDK_SCROLL_DOWN : GDK_SCROLL_UP;
 
3792
        }
 
3793
 
3780
3794
        switch (direction) {
3781
3795
        case GDK_SCROLL_UP:
3782
3796
                totem_action_seek_relative (totem, SEEK_FORWARD_SHORT_OFFSET * 1000, FALSE);
3784
3798
        case GDK_SCROLL_DOWN:
3785
3799
                totem_action_seek_relative (totem, SEEK_BACKWARD_SHORT_OFFSET * 1000, FALSE);
3786
3800
                break;
3787
 
        case GDK_SCROLL_LEFT:
3788
 
        case GDK_SCROLL_RIGHT:
3789
3801
        default:
3790
3802
                retval = FALSE;
3791
3803
        }
3881
3893
}
3882
3894
 
3883
3895
gboolean
3884
 
window_scroll_event_cb (GtkWidget *win, GdkEventScroll *event, TotemObject *totem)
 
3896
window_scroll_event_cb (GtkWidget *win, GdkEvent *event, TotemObject *totem)
3885
3897
{
3886
 
        return totem_action_handle_scroll (totem, event->direction);
 
3898
        return totem_action_handle_scroll (totem, event);
3887
3899
}
3888
3900
 
3889
3901
static void
4031
4043
        gdk_rgba_parse (&black, "Black");
4032
4044
        gtk_widget_override_background_color (vbox, (GTK_STATE_FLAG_FOCUSED << 1), &black);
4033
4045
 
4034
 
        totem_sidebar_setup (totem, show_sidebar, page_id);
 
4046
        totem_sidebar_setup (totem, show_sidebar);
4035
4047
        return page_id;
4036
4048
}
4037
4049
 
4149
4161
        gtk_widget_add_events (totem->win, GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK);
4150
4162
 
4151
4163
        /* Connect the mouse wheel */
4152
 
        gtk_widget_add_events (totem->win, GDK_SCROLL_MASK);
 
4164
        gtk_widget_add_events (GTK_WIDGET (gtk_builder_get_object (totem->xml, "tmw_main_vbox")), GDK_SCROLL_MASK);
4153
4165
        gtk_widget_add_events (totem->seek, GDK_SCROLL_MASK);
4154
4166
        gtk_widget_add_events (totem->fs->seek, GDK_SCROLL_MASK);
4155
4167