Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/code_blocks.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,6 @@ impl App {
}

pub(crate) fn highlighted_code_block(&self) -> Option<usize> {
self.code_select.or(self.hovered_code_block)
self.code_select
}
}
1 change: 0 additions & 1 deletion src/app/content.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ impl App {
self.hovered_link = None;
self.set_code_blocks(code_blocks);
self.code_select = None;
self.hovered_code_block = None;
self.set_line_maps(line_number_map, source_line_map);
self.refresh_static_caches();
}
Expand Down
3 changes: 0 additions & 3 deletions src/app/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,6 @@ pub(crate) struct App {
pub(crate) hovered_link: Option<(usize, usize)>,
pub(crate) code_blocks: Vec<CodeBlockInfo>,
pub(crate) code_select: Option<usize>,
pub(crate) hovered_code_block: Option<usize>,
code_block_flash: Option<(CodeBlockFlash, Instant)>,
link_flash: Option<(LinkFlash, Instant)>,
path_flash: Option<(PathFlash, Instant)>,
Expand Down Expand Up @@ -291,7 +290,6 @@ impl App {
hovered_link: None,
code_blocks: Vec::new(),
code_select: None,
hovered_code_block: None,
code_block_flash: None,
link_flash: None,
path_flash: None,
Expand Down Expand Up @@ -336,7 +334,6 @@ impl App {
self.mouse_capture = !self.mouse_capture;
if !self.mouse_capture {
self.hovered_link = None;
self.hovered_code_block = None;
self.hovered_toc_idx = None;
self.scrollbar_dragging = false;
}
Expand Down
5 changes: 0 additions & 5 deletions src/app/navigation.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,31 +40,26 @@ impl App {
pub(crate) fn scroll_down(&mut self, n: usize) {
self.reset_numkey_state();
self.scroll = (self.scroll + n).min(self.max_scroll());
self.hovered_code_block = None;
}

pub(crate) fn scroll_up(&mut self, n: usize) {
self.reset_numkey_state();
self.scroll = self.scroll.saturating_sub(n);
self.hovered_code_block = None;
}

pub(crate) fn scroll_top(&mut self) {
self.reset_numkey_state();
self.scroll = 0;
self.hovered_code_block = None;
}

pub(crate) fn scroll_bottom(&mut self) {
self.reset_numkey_state();
self.scroll = self.max_scroll();
self.hovered_code_block = None;
}

pub(crate) fn scroll_to(&mut self, position: usize) {
self.reset_numkey_state();
self.scroll = position.min(self.max_scroll());
self.hovered_code_block = None;
}

pub(crate) fn toggle_toc(&mut self) {
Expand Down
35 changes: 10 additions & 25 deletions src/runtime/mouse.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,33 +157,32 @@ pub(super) fn handle_mouse_event(app: &mut App, mouse: MouseEvent) -> bool {
false
}
} else if is_on_scrollbar(app.content_area, mouse.column, mouse.row) {
app.exit_code_select_mode();
app.scrollbar_dragging = true;
scrollbar_scroll_to(app, mouse.row);
true
} else if is_double_click {
if let Some(line_idx) = line_idx_at(app, mouse.column, mouse.row) {
if let Some(block_idx) = app.code_block_at_line(line_idx) {
app.copy_code_block_at(block_idx);
app.last_click = None;
return true;
}
let block_hit = line_idx_at(app, mouse.column, mouse.row)
.and_then(|line_idx| app.code_block_at_line(line_idx));
if let Some(block_idx) = block_hit {
app.code_select = Some(block_idx);
app.copy_code_block_at(block_idx);
app.last_click = None;
true
} else {
false
}
false
} else {
false
}
}
MouseEventKind::Down(MouseButton::Middle | MouseButton::Right)
if is_on_scrollbar(app.content_area, mouse.column, mouse.row) =>
{
app.exit_code_select_mode();
app.scrollbar_dragging = true;
scrollbar_scroll_to(app, mouse.row);
true
}
MouseEventKind::Drag(..) if app.scrollbar_dragging => {
app.exit_code_select_mode();
scrollbar_scroll_to(app, mouse.row);
true
}
Expand Down Expand Up @@ -223,21 +222,7 @@ pub(super) fn handle_mouse_event(app: &mut App, mouse: MouseEvent) -> bool {
app.hovered_toc_idx = new_toc_hover;
}

let new_code_block_hover = line_idx_at(app, mouse.column, mouse.row)
.and_then(|line_idx| app.code_block_at_line(line_idx));
let code_block_hover_changed = app.hovered_code_block != new_code_block_hover;
if code_block_hover_changed {
app.hovered_code_block = new_code_block_hover;
}
if app.code_select.is_some() {
if let Some(new_idx) = new_code_block_hover {
if app.code_select != Some(new_idx) {
app.code_select = Some(new_idx);
}
}
}

scrollbar_changed || hover_changed || toc_hover_changed || code_block_hover_changed
scrollbar_changed || hover_changed || toc_hover_changed
}
_ => false,
}
Expand Down
2 changes: 0 additions & 2 deletions src/tests/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,10 @@ fn toggle_mouse_capture_off_resets_hover_and_drag_state() {
parse_markdown("body", &ss, &theme, &test_md_theme(), false, true).into();
let mut app = App::new(lines, toc, "test".to_string(), false, false, None, None);
app.hovered_link = Some((3, 0));
app.hovered_code_block = Some(0);
app.hovered_toc_idx = Some(2);
app.scrollbar_dragging = true;
app.toggle_mouse_capture();
assert_eq!(app.hovered_link, None);
assert_eq!(app.hovered_code_block, None);
assert_eq!(app.hovered_toc_idx, None);
assert!(!app.scrollbar_dragging);
}
Expand Down
Loading