presentation: Allow to change rotation in presentation mode

diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c
index 3454d778fc4a51d163f3d0476a37a08f2dff081e..53acf2f361a671392d7c2a0ea0a3f95a2e5cc49a 100644 (file)
--- a/libview/ev-view-presentation.c
+++ b/libview/ev-view-presentation.c
@@ -57,6 +57,8 @@ struct _EvViewPresentation
 {
        GtkWidget base;
 
+        guint                  is_constructing : 1;
+
        guint                  current_page;
        cairo_surface_t       *current_surface;
        EvDocument            *document;
@@ -379,6 +381,25 @@ ev_view_presentation_delete_job (EvViewPresentation *pview,
        g_object_unref (job);
 }
 
+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)
@@ -927,21 +948,7 @@ ev_view_presentation_dispose (GObject *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);
@@ -1345,7 +1352,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);
@@ -1355,6 +1362,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,
@@ -1367,6 +1391,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);
@@ -1400,6 +1425,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,
@@ -1423,8 +1449,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",
@@ -1507,6 +1533,7 @@ static void
 ev_view_presentation_init (EvViewPresentation *pview)
 {
        gtk_widget_set_can_focus (GTK_WIDGET (pview), TRUE);
+        pview->is_constructing = TRUE;
 }
 
 GtkWidget *
@@ -1531,3 +1558,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 ad0a33a64a3523776a0b088273fff2cff6d921c1..e7857695d228774b9397ad8b223bf0b3746f6c54 100644 (file)
--- 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