summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoanmarie Diggs <[email protected]>2014-06-23 08:29:49 -0400
committerraveit65 <[email protected]>2017-08-28 16:04:00 +0200
commitff45d7270749a05814799a56b1626516433ece49 (patch)
treeac5d3aa2ba977c1101308bb141d4ef627face039
parent0ff0828b0dfa9c70597382421f1ca3a3dd5ff260 (diff)
downloadatril-ff45d7270749a05814799a56b1626516433ece49.tar.bz2
atril-ff45d7270749a05814799a56b1626516433ece49.tar.xz
libview: Rename ev_view_set_focused_element and make it public
internally This will be needed in order to implement atk_component_grab_focus https://bugzilla.gnome.org/show_bug.cgi?id=728475 origin commit: https://git.gnome.org/browse/evince/commit/?id=617dc0c
-rw-r--r--libview/ev-view-private.h4
-rw-r--r--libview/ev-view.c22
2 files changed, 15 insertions, 11 deletions
diff --git a/libview/ev-view-private.h b/libview/ev-view-private.h
index 7c8d14e8..4711e8f9 100644
--- a/libview/ev-view-private.h
+++ b/libview/ev-view-private.h
@@ -269,5 +269,9 @@ void _ev_view_transform_doc_rect_to_view_rect (EvView *view,
EvRectangle *doc_rect,
GdkRectangle *view_rect);
+void _ev_view_set_focused_element (EvView *view,
+ EvMapping *element_mapping,
+ gint page);
+
#endif /* __EV_VIEW_PRIVATE_H__ */
diff --git a/libview/ev-view.c b/libview/ev-view.c
index 07553c72..6258ea33 100644
--- a/libview/ev-view.c
+++ b/libview/ev-view.c
@@ -1995,8 +1995,8 @@ ev_view_get_focused_area (EvView *view,
return TRUE;
}
-static void
-ev_view_set_focused_element (EvView *view,
+void
+_ev_view_set_focused_element (EvView *view,
EvMapping *element_mapping,
gint page)
{
@@ -2165,7 +2165,7 @@ ev_view_form_field_button_create_widget (EvView *view,
form_mapping = ev_page_cache_get_form_field_mapping (view->page_cache,
field->page->index);
mapping = ev_mapping_list_find (form_mapping, field);
- ev_view_set_focused_element (view, mapping, field->page->index);
+ _ev_view_set_focused_element (view, mapping, field->page->index);
return NULL;
}
@@ -2516,7 +2516,7 @@ ev_view_focus_form_field (EvView *view,
EvMappingList *form_field_mapping;
EvMapping *mapping;
- ev_view_set_focused_element (view, NULL, -1);
+ _ev_view_set_focused_element (view, NULL, -1);
if (field->is_read_only)
return;
@@ -3061,8 +3061,8 @@ ev_view_focus_annotation (EvView *view,
if (!EV_IS_DOCUMENT_ANNOTATIONS (view->document))
return;
- ev_view_set_focused_element (view, annot_mapping,
- ev_annotation_get_page_index (EV_ANNOTATION (annot_mapping->data)));
+ _ev_view_set_focused_element (view, annot_mapping,
+ ev_annotation_get_page_index (EV_ANNOTATION (annot_mapping->data)));
}
void
@@ -3649,13 +3649,13 @@ ev_view_set_focused_element_at_location (EvView *view,
mapping = get_annotation_mapping_at_location (view, x, y, &page);
if (mapping) {
- ev_view_set_focused_element (view, mapping, page);
+ _ev_view_set_focused_element (view, mapping, page);
return;
}
mapping = get_link_mapping_at_location (view, x, y, &page);
if (mapping) {
- ev_view_set_focused_element (view, mapping, page);
+ _ev_view_set_focused_element (view, mapping, page);
return;
}
@@ -3665,7 +3665,7 @@ ev_view_set_focused_element_at_location (EvView *view,
return;
}
- ev_view_set_focused_element (view, NULL, -1);
+ _ev_view_set_focused_element (view, NULL, -1);
}
static gboolean
@@ -3887,7 +3887,7 @@ ev_view_button_press_event (GtkWidget *widget,
ev_view_remove_all (view);
ev_view_handle_form_field (view, field);
} else if ((link = get_link_mapping_at_location (view, event->x, event->y, &page))){
- ev_view_set_focused_element (view, link, page);
+ _ev_view_set_focused_element (view, link, page);
} else if (!location_in_text (view, event->x + view->scroll_x, event->y + view->scroll_y) &&
(image = ev_view_get_image_at_location (view, event->x, event->y))) {
if (view->image_dnd_info.image)
@@ -3899,7 +3899,7 @@ ev_view_button_press_event (GtkWidget *widget,
view->image_dnd_info.start.y = event->y + view->scroll_y;
} else {
ev_view_remove_all (view);
- ev_view_set_focused_element (view, NULL, -1);
+ _ev_view_set_focused_element (view, NULL, -1);
if (view->synctex_result) {
g_free (view->synctex_result);