Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Re-arrange how lines are set

Browse source
This commit is contained in:
Mikayla Maki 2022-10-10 11:38:28 -07:00
parent 1af4b263b2
commit 1d2495d57b
2 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/editor/src/editor.rs
View file

@ -451,7 +451,7 @@ pub struct Editor {
leader_replica_id: Option<u16>, leader_replica_id: Option<u16>,
hover_state: HoverState, hover_state: HoverState,
link_go_to_definition_state: LinkGoToDefinitionState, link_go_to_definition_state: LinkGoToDefinitionState,
lines: Option<f32>, visible_line_count: Option<f32>,
_subscriptions: Vec<Subscription>, _subscriptions: Vec<Subscription>,
} }
@ -1053,7 +1053,7 @@ impl Editor {
leader_replica_id: None, leader_replica_id: None,
hover_state: Default::default(), hover_state: Default::default(),
link_go_to_definition_state: Default::default(), link_go_to_definition_state: Default::default(),
lines: None, visible_line_count: None,
_subscriptions: vec![ _subscriptions: vec![
cx.observe(&buffer, Self::on_buffer_changed), cx.observe(&buffer, Self::on_buffer_changed),
cx.subscribe(&buffer, Self::on_buffer_event), cx.subscribe(&buffer, Self::on_buffer_event),
@ -1188,8 +1188,8 @@ impl Editor {
cx.notify(); cx.notify();
} }
fn set_lines(&mut self, lines: f32) { fn set_visible_line_count(&mut self, lines: f32) {
self.lines = Some(lines) self.visible_line_count = Some(lines)
} }
fn set_scroll_top_anchor( fn set_scroll_top_anchor(
@ -5521,8 +5521,7 @@ impl Editor {
} }
pub fn page_up(&mut self, _: &PageUp, cx: &mut ViewContext<Self>) { pub fn page_up(&mut self, _: &PageUp, cx: &mut ViewContext<Self>) {
log::info!("Editor::page_up"); let lines = match self.visible_line_count {
let lines = match self.lines {
Some(lines) => lines, Some(lines) => lines,
None => return, None => return,
}; };
@ -5533,8 +5532,7 @@ impl Editor {
} }
pub fn page_down(&mut self, _: &PageDown, cx: &mut ViewContext<Self>) { pub fn page_down(&mut self, _: &PageDown, cx: &mut ViewContext<Self>) {
log::info!("Editor::page_up"); let lines = match self.visible_line_count {
let lines = match self.lines {
Some(lines) => lines, Some(lines) => lines,
None => return, None => return,
}; };

4
crates/editor/src/element.rs
View file

@ -1422,6 +1422,8 @@ impl Element for EditorElement {
let em_advance = style.text.em_advance(cx.font_cache); let em_advance = style.text.em_advance(cx.font_cache);
let overscroll = vec2f(em_width, 0.); let overscroll = vec2f(em_width, 0.);
let snapshot = self.update_view(cx.app, |view, cx| { let snapshot = self.update_view(cx.app, |view, cx| {
view.set_visible_line_count(size.y() / line_height);
let wrap_width = match view.soft_wrap_mode(cx) { let wrap_width = match view.soft_wrap_mode(cx) {
SoftWrap::None => Some((MAX_LINE_LEN / 2) as f32 * em_advance), SoftWrap::None => Some((MAX_LINE_LEN / 2) as f32 * em_advance),
SoftWrap::EditorWidth => { SoftWrap::EditorWidth => {
@ -1495,8 +1497,6 @@ impl Element for EditorElement {
let mut highlighted_rows = None; let mut highlighted_rows = None;
let mut highlighted_ranges = Vec::new(); let mut highlighted_ranges = Vec::new();
self.update_view(cx.app, |view, cx| { self.update_view(cx.app, |view, cx| {
view.set_lines(size.y() / line_height);
let display_map = view.display_map.update(cx, |map, cx| map.snapshot(cx)); let display_map = view.display_map.update(cx, |map, cx| map.snapshot(cx));
highlighted_rows = view.highlighted_rows(); highlighted_rows = view.highlighted_rows();