summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garcia Campos <[email protected]>2013-07-03 19:00:28 +0200
committerraveit65 <[email protected]>2017-09-06 18:25:34 +0200
commit40e61ed825920e0f0127d0ab9b168f8c809fc641 (patch)
treefcd0eb16c0e0f6c1ad00c9099eba0bf133d32a81
parentd7d45381c5fc30f44086acf4ce6ae4b881ae7ff4 (diff)
downloadatril-40e61ed825920e0f0127d0ab9b168f8c809fc641.tar.bz2
atril-40e61ed825920e0f0127d0ab9b168f8c809fc641.tar.xz
libview: Do not show the caret cursor when there are active selections
https://bugzilla.gnome.org/show_bug.cgi?id=702761 origin commit: https://git.gnome.org/browse/evince/commit/?h=gnome-3-10&id=604cd6d
-rw-r--r--libview/ev-view.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libview/ev-view.c b/libview/ev-view.c
index 4122d391..f1d9f5f0 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -3957,7 +3957,8 @@ should_draw_caret_cursor (EvView *view,
return (view->caret_enabled &&
view->cursor_page == page &&
view->cursor_visible &&
- gtk_widget_has_focus (GTK_WIDGET (view)));
+ gtk_widget_has_focus (GTK_WIDGET (view)) &&
+ !ev_pixbuf_cache_get_selection_region (view->pixbuf_cache, page, view->scale));
}
static void