From: Carlos Garcia Campos <carlosgc@gnome.org>
Date: Wed, 25 Nov 2009 11:06:28 +0000 (+0100)
Subject: [libview] Do not resize the window when zoom in/out with CTRL+Scroll
X-Git-Tag: EVINCE_2_29_3~20
X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=commitdiff_plain;h=cf9762c15fae990c6cb63361274deefb9303d91e;p=evince.git

[libview] Do not resize the window when zoom in/out with CTRL+Scroll

Fixes bgo#602798.
---

diff --git a/libview/ev-view.c b/libview/ev-view.c
index 36b459ce..91ce4708 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -3008,8 +3008,7 @@ ev_view_scroll_event (GtkWidget *widget, GdkEventScroll *event)
 	state = event->state & gtk_accelerator_get_default_mod_mask ();
 
 	if (state == GDK_CONTROL_MASK && view->presentation == FALSE) {
-		ev_view_set_sizing_mode (view, EV_SIZING_FREE);
-
+		ev_document_model_set_sizing_mode (view->model, EV_SIZING_FREE);
 		if (event->direction == GDK_SCROLL_UP ||
 		    event->direction == GDK_SCROLL_LEFT) {
 			if (ev_view_can_zoom_in (view)) {
@@ -5444,7 +5443,7 @@ ev_view_set_presentation (EvView   *view,
 	if (presentation) {
 		view->sizing_mode_saved = view->sizing_mode;
 		view->scale_saved = view->scale;
-		ev_view_set_sizing_mode (view, EV_SIZING_BEST_FIT);
+		ev_document_model_set_sizing_mode (view->model, EV_SIZING_BEST_FIT);
 	} else {
 		ev_document_model_set_sizing_mode (view->model, view->sizing_mode_saved);
 		ev_document_model_set_scale (view->model, view->scale_saved);