diff options
| author | Bastien Nocera <hadess@hadess.net> | 2014-01-29 17:14:44 +0100 |
|---|---|---|
| committer | Bastien Nocera <hadess@hadess.net> | 2014-01-29 19:06:00 +0100 |
| commit | fd6873de492568c052e86316e859a684df465868 (patch) | |
| tree | c3638a746bf0f8b30523b411df05e858a39fa1e2 | |
| parent | abb28da96abace9ed3525d19338cec8b15adc61f (diff) | |
| download | totem-fd6873de492568c052e86316e859a684df465868.tar.gz | |
main: Remove transitions between player/browser
| -rw-r--r-- | src/totem-object.c | 20 | ||||
| -rw-r--r-- | src/totem-private.h | 3 | ||||
| -rw-r--r-- | src/totem-session.c | 2 |
3 files changed, 6 insertions, 19 deletions
diff --git a/src/totem-object.c b/src/totem-object.c index 1105faee6..78b1f986b 100644 --- a/src/totem-object.c +++ b/src/totem-object.c @@ -853,21 +853,9 @@ totem_object_remove_sidebar_page (TotemObject *totem, void totem_object_set_main_page (TotemObject *totem, - const char *page_id, - gboolean animate) + const char *page_id) { - GtkStackTransitionType type; - - if (!animate) - type = GTK_STACK_TRANSITION_TYPE_NONE; - else if (g_str_equal (page_id, "player")) - type = GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT; - else - type = GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT; - - /* FIXME should we increase the minimum duration like that? */ - gtk_stack_set_transition_duration (GTK_STACK (totem->stack), 500); - gtk_stack_set_visible_child_full (GTK_STACK (totem->stack), page_id, type); + gtk_stack_set_visible_child_full (GTK_STACK (totem->stack), page_id, GTK_STACK_TRANSITION_TYPE_NONE); } /** @@ -1313,7 +1301,7 @@ totem_object_play (TotemObject *totem) if (bacon_video_widget_is_playing (totem->bvw) != FALSE) return; - totem_object_set_main_page (totem, "player", TRUE); + totem_object_set_main_page (totem, "player"); retval = bacon_video_widget_play (totem->bvw, &err); play_pause_set_label (totem, retval ? STATE_PLAYING : STATE_STOPPED); @@ -2227,7 +2215,7 @@ back_button_clicked_cb (GtkButton *button, TotemObject *totem) { totem_playlist_clear (totem->playlist); - totem_object_set_main_page (totem, "grilo", TRUE); + totem_object_set_main_page (totem, "grilo"); } static void diff --git a/src/totem-private.h b/src/totem-private.h index cc1ffe472..24af562b1 100644 --- a/src/totem-private.h +++ b/src/totem-private.h @@ -190,8 +190,7 @@ void totem_object_add_main_page (TotemObject *totem, const char *page_id, GtkWidget *widget); void totem_object_set_main_page (TotemObject *totem, - const char *page_id, - gboolean animate); + const char *page_id); const char * totem_object_get_main_page (Totem *totem); /* Signal emission */ diff --git a/src/totem-session.c b/src/totem-session.c index 4cfd080eb..ed4caa50c 100644 --- a/src/totem-session.c +++ b/src/totem-session.c @@ -75,7 +75,7 @@ totem_session_try_restore (Totem *totem) mrl = totem_playlist_get_current_mrl (totem->playlist, &subtitle); if (mrl != NULL) - totem_object_set_main_page (totem, "player", FALSE); + totem_object_set_main_page (totem, "player"); totem_object_set_mrl (totem, mrl, subtitle); |