X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-window.c;h=93f674b6b189854f4cd64577e61f5750a57852ee;hb=761de5f5ba44cc94c98adf2b68809ea453d6bdfa;hp=e9aee88912ca71f9aa47c7496f646089e6a05b26;hpb=ee37f085119db53f4108c3d5c398b2104bb3cdf2;p=evince.git

diff --git a/shell/ev-window.c b/shell/ev-window.c
index e9aee889..93f674b6 100644
--- a/shell/ev-window.c
+++ b/shell/ev-window.c
@@ -62,6 +62,7 @@
 #include "ev-document-thumbnails.h"
 #include "ev-document-annotations.h"
 #include "ev-document-type-builtins.h"
+#include "ev-document-misc.h"
 #include "ev-file-exporter.h"
 #include "ev-file-helpers.h"
 #include "ev-file-monitor.h"
@@ -321,6 +322,15 @@ static guint ev_window_n_copies = 0;
 
 G_DEFINE_TYPE (EvWindow, ev_window, GTK_TYPE_WINDOW)
 
+static gdouble
+get_screen_dpi (EvWindow *window)
+{
+	GdkScreen *screen;
+
+	screen = gtk_window_get_screen (GTK_WINDOW (window));
+	return ev_document_misc_get_screen_dpi (screen);
+}
+
 static void
 ev_window_set_action_sensitive (EvWindow   *ev_window,
 		    	        const char *name,
@@ -497,7 +507,7 @@ ev_window_update_actions (EvWindow *ev_window)
 						      ZOOM_CONTROL_ACTION);
 
 		real_zoom = ev_document_model_get_scale (ev_window->priv->model);
-		real_zoom *= 72.0 / get_screen_dpi (GTK_WINDOW (ev_window));
+		real_zoom *= 72.0 / get_screen_dpi (ev_window);
 		zoom = ephy_zoom_get_nearest_zoom_level (real_zoom);
 
 		ephy_zoom_action_set_zoom_level (EPHY_ZOOM_ACTION (action), zoom);
@@ -982,7 +992,7 @@ setup_model_from_metadata (EvWindow *window)
 	/* Zoom */
 	if (ev_document_model_get_sizing_mode (window->priv->model) == EV_SIZING_FREE &&
 	    ev_metadata_get_double (window->priv->metadata, "zoom", &zoom)) {
-		zoom *= get_screen_dpi (GTK_WINDOW (window)) / 72.0;
+		zoom *= get_screen_dpi (window) / 72.0;
 		ev_document_model_set_scale (window->priv->model, zoom);
 	}
 
@@ -3711,7 +3721,7 @@ ev_window_screen_changed (GtkWidget *widget,
 		return;
 
 	ev_window_setup_gtk_settings (window);
-	dpi = get_screen_dpi (GTK_WINDOW (window));
+	dpi = get_screen_dpi (window);
 	ev_document_model_set_min_scale (priv->model, MIN_SCALE * dpi / 72.0);
 	ev_document_model_set_max_scale (priv->model, MAX_SCALE * dpi / 72.0);
 
@@ -4067,7 +4077,7 @@ ev_window_zoom_changed_cb (EvDocumentModel *model, GParamSpec *pspec, EvWindow *
 		gdouble zoom;
 
 		zoom = ev_document_model_get_scale (model);
-		zoom *= 72.0 / get_screen_dpi (GTK_WINDOW (ev_window));
+		zoom *= 72.0 / get_screen_dpi (ev_window);
 		ev_metadata_set_double (ev_window->priv->metadata, "zoom", zoom);
 	}
 }
@@ -4442,16 +4452,34 @@ view_menu_annot_popup (EvWindow     *ev_window,
 
 static gboolean
 view_menu_popup_cb (EvView   *view,
-		    GObject  *object,
+		    GList    *items,
 		    EvWindow *ev_window)
 {
-	view_menu_link_popup (ev_window,
-			      EV_IS_LINK (object) ? EV_LINK (object) : NULL);
-	view_menu_image_popup (ev_window,
-			       EV_IS_IMAGE (object) ? EV_IMAGE (object) : NULL);
-	view_menu_annot_popup (ev_window,
-			       EV_IS_ANNOTATION (object) ? EV_ANNOTATION (object) : NULL);
-	
+	GList   *l;
+	gboolean has_link = FALSE;
+	gboolean has_image = FALSE;
+	gboolean has_annot = FALSE;
+
+	for (l = items; l; l = g_list_next (l)) {
+		if (EV_IS_LINK (l->data)) {
+			view_menu_link_popup (ev_window, EV_LINK (l->data));
+			has_link = TRUE;
+		} else if (EV_IS_IMAGE (l->data)) {
+			view_menu_image_popup (ev_window, EV_IMAGE (l->data));
+			has_image = TRUE;
+		} else if (EV_IS_ANNOTATION (l->data)) {
+			view_menu_annot_popup (ev_window, EV_ANNOTATION (l->data));
+			has_annot = TRUE;
+		}
+	}
+
+	if (!has_link)
+		view_menu_link_popup (ev_window, NULL);
+	if (!has_image)
+		view_menu_image_popup (ev_window, NULL);
+	if (!has_annot)
+		view_menu_annot_popup (ev_window, NULL);
+
 	gtk_menu_popup (GTK_MENU (ev_window->priv->view_popup),
 			NULL, NULL, NULL, NULL,
 			3, gtk_get_current_event_time ());
@@ -4667,7 +4695,7 @@ zoom_control_changed_cb (EphyZoomAction *action,
 
 	if (mode == EV_SIZING_FREE) {
 		ev_document_model_set_scale (ev_window->priv->model,
-					     zoom * get_screen_dpi (GTK_WINDOW (ev_window)) / 72.0);
+					     zoom * get_screen_dpi (ev_window) / 72.0);
 	}
 }
 
@@ -6254,7 +6282,7 @@ ev_window_init (EvWindow *ev_window)
 
 	ev_window->priv->view = ev_view_new ();
 	ev_view_set_model (EV_VIEW (ev_window->priv->view), ev_window->priv->model);
-	dpi = get_screen_dpi (GTK_WINDOW (ev_window));
+	dpi = get_screen_dpi (ev_window);
 	ev_document_model_set_min_scale (ev_window->priv->model, MIN_SCALE * dpi / 72.0);
 	ev_document_model_set_max_scale (ev_window->priv->model, MAX_SCALE * dpi / 72.0);
 	ev_window->priv->password_view = ev_password_view_new (GTK_WINDOW (ev_window));