libview: Fix goto window in presentation mode

[evince.git] / libview / ev-view-presentation.c

diff --git a/libview/ev-view-presentation.c b/libview/ev-view-presentation.c
index 914868a2b9692b384e3a8a3392582aee2a4b4cb2..8694e5e304ef6d4a48d9d872f4fd5372b752cb02 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;
@@ -104,8 +106,6 @@ struct _EvViewPresentationClass
 
 static guint signals[N_SIGNALS] = { 0 };
 
-static void ev_view_presentation_next_page               (EvViewPresentation *pview);
-static void ev_view_presentation_previous_page           (EvViewPresentation *pview);
 static void ev_view_presentation_set_cursor_for_location (EvViewPresentation *pview,
                                                          gdouble             x,
                                                          gdouble             y);
@@ -381,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)
@@ -485,7 +504,7 @@ ev_view_presentation_update_current_page (EvViewPresentation *pview,
                gtk_widget_queue_draw (GTK_WIDGET (pview));
 }
 
-static void
+void
 ev_view_presentation_next_page (EvViewPresentation *pview)
 {
        guint n_pages;
@@ -510,7 +529,7 @@ ev_view_presentation_next_page (EvViewPresentation *pview)
                ev_view_presentation_update_current_page (pview, new_page);
 }
 
-static void
+void
 ev_view_presentation_previous_page (EvViewPresentation *pview)
 {
        gint new_page = 0;
@@ -630,9 +649,9 @@ ev_view_presentation_goto_window_create (EvViewPresentation *pview)
        GtkWindow *toplevel, *goto_window;
 
        toplevel = GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (pview)));
-       goto_window = GTK_WINDOW (pview->goto_window);
 
        if (pview->goto_window) {
+                goto_window = GTK_WINDOW (pview->goto_window);
                if (gtk_window_has_group (toplevel))
                        gtk_window_group_add_window (gtk_window_get_group (toplevel), goto_window);
                else if (gtk_window_has_group (goto_window))
@@ -642,6 +661,7 @@ ev_view_presentation_goto_window_create (EvViewPresentation *pview)
        }
 
        pview->goto_window = gtk_window_new (GTK_WINDOW_POPUP);
+        goto_window = GTK_WINDOW (pview->goto_window);
        gtk_window_set_screen (goto_window, gtk_widget_get_screen (GTK_WIDGET (pview)));
 
        if (gtk_window_has_group (toplevel))
@@ -929,21 +949,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);
@@ -1266,8 +1272,8 @@ ev_view_presentation_realize (GtkWidget *widget)
 
        gdk_window_set_user_data (window, widget);
        gtk_widget_set_window (widget, window);
-
-        gdk_window_set_background_rgba (window, &black);
+        gtk_style_context_set_background (gtk_widget_get_style_context (widget),
+                                          window);
 
        g_idle_add ((GSourceFunc)init_presentation, widget);
 }
@@ -1347,7 +1353,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);
@@ -1357,6 +1363,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,
@@ -1369,6 +1392,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);
@@ -1384,6 +1408,7 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass)
        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
        GObjectClass   *gobject_class = G_OBJECT_CLASS (klass);
        GtkBindingSet  *binding_set;
+        GtkCssProvider *provider;
 
        klass->change_page = ev_view_presentation_change_page;
 
@@ -1401,6 +1426,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,
@@ -1424,8 +1450,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",
@@ -1492,12 +1518,23 @@ ev_view_presentation_class_init (EvViewPresentationClass *klass)
        gtk_binding_entry_add_signal (binding_set, GDK_KEY_K, 0,
                                      "change_page", 1,
                                      GTK_TYPE_SCROLL_TYPE, GTK_SCROLL_PAGE_BACKWARD);
+
+        provider = gtk_css_provider_new ();
+        gtk_css_provider_load_from_data (provider,
+                                         "EvViewPresentation {\n"
+                                         " background-color: black; }",
+                                         -1, NULL);
+        gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+                                                   GTK_STYLE_PROVIDER (provider),
+                                                   GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+        g_object_unref (provider);
 }
 
 static void
 ev_view_presentation_init (EvViewPresentation *pview)
 {
        gtk_widget_set_can_focus (GTK_WIDGET (pview), TRUE);
+        pview->is_constructing = TRUE;
 }
 
 GtkWidget *
@@ -1522,3 +1559,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;
+}