diff options
| author | infirit <[email protected]> | 2014-12-10 01:45:16 +0100 |
|---|---|---|
| committer | infirit <[email protected]> | 2014-12-10 01:45:16 +0100 |
| commit | 8389b5ec0106f63fbe04c42bd9f120f67ec3d078 (patch) | |
| tree | 8ab147861e8a6a5593b867a71d396a98bc58eab9 /libview | |
| parent | df6d74cc8fbdc2ec0b88ad459da02817cf4e9482 (diff) | |
| download | atril-8389b5ec0106f63fbe04c42bd9f120f67ec3d078.tar.bz2 atril-8389b5ec0106f63fbe04c42bd9f120f67ec3d078.tar.xz | |
presentation: Allow to change rotation in presentation mode
Taken from evince commit: ef9c2b1a189ddbdbd7cdb10dad6c3c6db4cb0ccd
From: Carlos Garcia Campos <[email protected]>
Diffstat (limited to 'libview')
| -rw-r--r-- | libview/ev-view-presentation.c | 91 | ||||
| -rw-r--r-- | libview/ev-view-presentation.h | 3 |
2 files changed, 76 insertions, 18 deletions
diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c index 36632919..118df5f7 100644 --- a/libview/ev-view-presentation.c +++ b/libview/ev-view-presentation.c @@ -62,6 +62,8 @@ struct _EvViewPresentation { GtkWidget base; + guint is_constructing : 1; + guint current_page; cairo_surface_t *current_surface; EvDocument *document; @@ -411,6 +413,25 @@ ev_view_presentation_delete_job (EvViewPresentation *pview, } static void +ev_view_presentation_reset_jobs (EvViewPresentation *pview) +{ + if (pview->curr_job) { + ev_view_presentation_delete_job (pview, pview->curr_job); + pview->curr_job = NULL; + } + + if (pview->prev_job) { + ev_view_presentation_delete_job (pview, pview->prev_job); + pview->prev_job = NULL; + } + + if (pview->next_job) { + ev_view_presentation_delete_job (pview, pview->next_job); + pview->next_job = NULL; + } +} + +static void ev_view_presentation_update_current_page (EvViewPresentation *pview, guint page) { @@ -962,21 +983,7 @@ ev_view_presentation_destroy (GtkObject *object) ev_view_presentation_animation_cancel (pview); ev_view_presentation_transition_stop (pview); ev_view_presentation_hide_cursor_timeout_stop (pview); - - if (pview->curr_job) { - ev_view_presentation_delete_job (pview, pview->curr_job); - pview->curr_job = NULL; - } - - if (pview->prev_job) { - ev_view_presentation_delete_job (pview, pview->prev_job); - pview->prev_job = NULL; - } - - if (pview->next_job) { - ev_view_presentation_delete_job (pview, pview->next_job); - pview->next_job = NULL; - } + ev_view_presentation_reset_jobs (pview); if (pview->current_surface) { cairo_surface_destroy (pview->current_surface); @@ -1448,7 +1455,7 @@ ev_view_presentation_set_property (GObject *object, pview->current_page = g_value_get_uint (value); break; case PROP_ROTATION: - pview->rotation = g_value_get_uint (value); + ev_view_presentation_set_rotation (pview, g_value_get_uint (value)); break; case PROP_INVERTED_COLORS: pview->inverted_colors = g_value_get_boolean (value); @@ -1458,6 +1465,23 @@ ev_view_presentation_set_property (GObject *object, } } +static void +ev_view_presentation_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + EvViewPresentation *pview = EV_VIEW_PRESENTATION (object); + + switch (prop_id) { + case PROP_ROTATION: + g_value_set_uint (value, ev_view_presentation_get_rotation (pview)); + break; + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + } +} + static GObject * ev_view_presentation_constructor (GType type, guint n_construct_properties, @@ -1470,6 +1494,7 @@ ev_view_presentation_constructor (GType type, n_construct_properties, construct_params); pview = EV_VIEW_PRESENTATION (object); + pview->is_constructing = FALSE; if (EV_IS_DOCUMENT_LINKS (pview->document)) { pview->page_cache = ev_page_cache_new (pview->document); @@ -1520,6 +1545,7 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass) gobject_class->constructor = ev_view_presentation_constructor; gobject_class->set_property = ev_view_presentation_set_property; + gobject_class->get_property = ev_view_presentation_get_property; g_object_class_install_property (gobject_class, PROP_DOCUMENT, @@ -1543,8 +1569,8 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass) "Rotation", "Current rotation angle", 0, 360, 0, - G_PARAM_WRITABLE | - G_PARAM_CONSTRUCT_ONLY)); + G_PARAM_READWRITE | + G_PARAM_CONSTRUCT)); g_object_class_install_property (gobject_class, PROP_INVERTED_COLORS, g_param_spec_boolean ("inverted_colors", @@ -1629,6 +1655,7 @@ static void ev_view_presentation_init (EvViewPresentation *pview) { gtk_widget_set_can_focus (GTK_WIDGET (pview), TRUE); + pview->is_constructing = TRUE; } GtkWidget * @@ -1653,3 +1680,31 @@ ev_view_presentation_get_current_page (EvViewPresentation *pview) { return pview->current_page; } + +void +ev_view_presentation_set_rotation (EvViewPresentation *pview, + gint rotation) +{ + if (rotation >= 360) + rotation -= 360; + else if (rotation < 0) + rotation += 360; + + if (pview->rotation == rotation) + return; + + pview->rotation = rotation; + g_object_notify (G_OBJECT (pview), "rotation"); + if (pview->is_constructing) + return; + + pview->scale = 0; + ev_view_presentation_reset_jobs (pview); + ev_view_presentation_update_current_page (pview, pview->current_page); +} + +guint +ev_view_presentation_get_rotation (EvViewPresentation *pview) +{ + return pview->rotation; +} diff --git a/libview/ev-view-presentation.h b/libview/ev-view-presentation.h index df8f6fc5..2e4921c5 100644 --- a/libview/ev-view-presentation.h +++ b/libview/ev-view-presentation.h @@ -47,6 +47,9 @@ GtkWidget *ev_view_presentation_new (EvDocument *document, guint ev_view_presentation_get_current_page (EvViewPresentation *pview); void ev_view_presentation_next_page (EvViewPresentation *pview); void ev_view_presentation_previous_page (EvViewPresentation *pview); +void ev_view_presentation_set_rotation (EvViewPresentation *pview, + gint rotation); +guint ev_view_presentation_get_rotation (EvViewPresentation *pview); G_END_DECLS |