bendns' repos / helix
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'helix-view/src/lib.rs')
-rw-r--r--helix-view/src/lib.rs12
1 files changed, 5 insertions, 7 deletions
diff --git a/helix-view/src/lib.rs b/helix-view/src/lib.rs
index a7e9f461..14b6e1ce 100644
--- a/helix-view/src/lib.rs
+++ b/helix-view/src/lib.rs
@@ -1,12 +1,11 @@
#[macro_use]
pub mod macros;
-pub mod annotations;
+pub mod base64;
pub mod clipboard;
pub mod document;
pub mod editor;
pub mod events;
-pub mod expansion;
pub mod graphics;
pub mod gutter;
pub mod handlers;
@@ -47,12 +46,11 @@ pub enum Align {
Bottom,
}
-pub fn align_view(doc: &mut Document, view: &View, align: Align) {
+pub fn align_view(doc: &Document, view: &mut View, align: Align) {
let doc_text = doc.text().slice(..);
let cursor = doc.selection(view.id).primary().cursor(doc_text);
let viewport = view.inner_area(doc);
let last_line_height = viewport.height.saturating_sub(1);
- let mut view_offset = doc.view_offset(view.id);
let relative = match align {
Align::Center => last_line_height / 2,
@@ -61,15 +59,15 @@ pub fn align_view(doc: &mut Document, view: &View, align: Align) {
};
let text_fmt = doc.text_format(viewport.width, None);
- (view_offset.anchor, view_offset.vertical_offset) = char_idx_at_visual_offset(
+ let annotations = view.text_annotations(doc, None);
+ (view.offset.anchor, view.offset.vertical_offset) = char_idx_at_visual_offset(
doc_text,
cursor,
-(relative as isize),
0,
&text_fmt,
- &view.text_annotations(doc, None),
+ &annotations,
);
- doc.set_view_offset(view.id, view_offset);
}
pub use document::Document;