summaryrefslogtreecommitdiff
path: root/libview
diff options
context:
space:
mode:
authorCarlos Garcia Campos <[email protected]>2012-11-25 11:53:10 +0100
committerraveit65 <[email protected]>2017-08-31 13:28:20 +0200
commitad4ce2cbce9cf6a25082118b3380fc64555d9fb7 (patch)
treed9e57e0f04a5ce780e7c2e8f189b4822bbda879a /libview
parent5410b0b58c8c16e2e7ec5fdc8347f2191c4bc74c (diff)
downloadatril-ad4ce2cbce9cf6a25082118b3380fc64555d9fb7.tar.bz2
atril-ad4ce2cbce9cf6a25082118b3380fc64555d9fb7.tar.xz
Move dual page with odd pages left to the view menu
As a toggle option only available in dual mode. origin commit: https://git.gnome.org/browse/evince/commit/?h=gnome-3-10&id=1078b8f
Diffstat (limited to 'libview')
-rw-r--r--libview/ev-document-model.c10
-rw-r--r--libview/ev-view.c9
2 files changed, 2 insertions, 17 deletions
diff --git a/libview/ev-document-model.c b/libview/ev-document-model.c
index 572f5526..856ee36e 100644
--- a/libview/ev-document-model.c
+++ b/libview/ev-document-model.c
@@ -559,11 +559,6 @@ ev_document_model_set_dual_page (EvDocumentModel *model,
model->dual_page = dual_page;
g_object_notify (G_OBJECT (model), "dual-page");
-
- if (dual_page && model->dual_page_odd_left) {
- model->dual_page_odd_left = FALSE;
- g_object_notify (G_OBJECT (model), "dual-odd-left");
- }
}
gboolean
@@ -588,11 +583,6 @@ ev_document_model_set_dual_page_odd_pages_left (EvDocumentModel *model,
model->dual_page_odd_left = odd_left;
g_object_notify (G_OBJECT (model), "dual-odd-left");
-
- if (odd_left && model->dual_page) {
- model->dual_page = FALSE;
- g_object_notify (G_OBJECT (model), "dual-page");
- }
}
gboolean
diff --git a/libview/ev-view.c b/libview/ev-view.c
index 80f1df48..72abcb86 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -5708,9 +5708,7 @@ ev_view_dual_page_changed_cb (EvDocumentModel *model,
GParamSpec *pspec,
EvView *view)
{
- gboolean dual_page = ev_document_model_get_dual_page (model);
-
- view->dual_page = dual_page || ev_document_model_get_dual_page_odd_pages_left (model);
+ view->dual_page = ev_document_model_get_dual_page (model);
view->pending_scroll = SCROLL_TO_PAGE_POSITION;
/* FIXME: if we're keeping the pixbuf cache around, we should extend the
* preload_cache_size to be 2 if dual_page is set.
@@ -5723,10 +5721,7 @@ ev_view_dual_odd_left_changed_cb (EvDocumentModel *model,
GParamSpec *pspec,
EvView *view)
{
- gboolean dual_odd_left = ev_document_model_get_dual_page_odd_pages_left (model);
-
- view->dual_page = dual_odd_left || ev_document_model_get_dual_page (model);
- view->dual_even_left = !dual_odd_left;
+ view->dual_even_left = !ev_document_model_get_dual_page_odd_pages_left (model);
view->pending_scroll = SCROLL_TO_PAGE_POSITION;
gtk_widget_queue_resize (GTK_WIDGET (view));