Skip to content

Commit bde8eb8

Browse files
author
Stephan Dilly
committed
Revert "Support mouse scrolling (#306)"
This reverts commit 457f644.
1 parent 59acccc commit bde8eb8

File tree

5 files changed

+8
-95
lines changed

5 files changed

+8
-95
lines changed

src/components/commit_details/details.rs

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ use asyncgit::{
1212
sync::{self, CommitDetails, CommitId, CommitMessage},
1313
CWD,
1414
};
15-
use crossterm::event::{
16-
Event,
17-
MouseEventKind::{ScrollDown, ScrollUp},
18-
};
15+
use crossterm::event::Event;
1916
use itertools::Itertools;
2017
use std::clone::Clone;
2118
use std::{borrow::Cow, cell::Cell};
@@ -397,15 +394,7 @@ impl Component for DetailsComponent {
397394

398395
fn event(&mut self, event: Event) -> Result<bool> {
399396
if self.focused {
400-
if let Event::Mouse(mouse_ev) = event {
401-
return Ok(match mouse_ev.kind {
402-
ScrollUp => self.move_scroll_top(ScrollType::Up),
403-
ScrollDown => {
404-
self.move_scroll_top(ScrollType::Down)
405-
}
406-
_ => false,
407-
});
408-
} else if let Event::Key(e) = event {
397+
if let Event::Key(e) = event {
409398
return Ok(if e == self.key_config.move_up {
410399
self.move_scroll_top(ScrollType::Up)
411400
} else if e == self.key_config.move_down {

src/components/commitlist.rs

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ use crate::{
1111
};
1212
use anyhow::Result;
1313
use asyncgit::sync::Tags;
14-
use crossterm::event::{
15-
Event,
16-
MouseEventKind::{ScrollDown, ScrollUp},
17-
};
14+
use crossterm::event::Event;
1815
use std::{
1916
borrow::Cow, cell::Cell, cmp, convert::TryFrom, time::Instant,
2017
};
@@ -349,16 +346,7 @@ impl DrawableComponent for CommitList {
349346

350347
impl Component for CommitList {
351348
fn event(&mut self, ev: Event) -> Result<bool> {
352-
if let Event::Mouse(mouse_ev) = ev {
353-
let selection_changed = match mouse_ev.kind {
354-
ScrollUp => self.move_selection(ScrollType::Up)?,
355-
ScrollDown => {
356-
self.move_selection(ScrollType::Down)?
357-
}
358-
_ => false,
359-
};
360-
return Ok(selection_changed);
361-
} else if let Event::Key(k) = ev {
349+
if let Event::Key(k) = ev {
362350
let selection_changed = if k == self.key_config.move_up {
363351
self.move_selection(ScrollType::Up)?
364352
} else if k == self.key_config.move_down {

src/components/diff.rs

Lines changed: 2 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,7 @@ use crate::{
1111
use anyhow::Result;
1212
use asyncgit::{hash, sync, DiffLine, DiffLineType, FileDiff, CWD};
1313
use bytesize::ByteSize;
14-
use crossterm::event::{
15-
Event, KeyModifiers,
16-
MouseEventKind::{ScrollDown, ScrollUp},
17-
};
14+
use crossterm::event::Event;
1815
use std::{borrow::Cow, cell::Cell, cmp, path::Path};
1916
use tui::{
2017
backend::Backend,
@@ -632,54 +629,9 @@ impl Component for DiffComponent {
632629
CommandBlocking::PassingOn
633630
}
634631

635-
#[allow(clippy::too_many_lines)]
636632
fn event(&mut self, ev: Event) -> Result<bool> {
637633
if self.focused {
638-
if let Event::Mouse(mouse_ev) = ev {
639-
return match mouse_ev.kind {
640-
ScrollUp => {
641-
match mouse_ev.modifiers {
642-
KeyModifiers::SHIFT => {
643-
self.modify_selection(Direction::Up);
644-
}
645-
KeyModifiers::CONTROL => {
646-
self.modify_selection(Direction::Up);
647-
self.modify_selection(Direction::Up);
648-
self.modify_selection(Direction::Up);
649-
}
650-
KeyModifiers::NONE => {
651-
self.move_selection(ScrollType::Up);
652-
}
653-
_ => {}
654-
};
655-
Ok(true)
656-
}
657-
ScrollDown => {
658-
match mouse_ev.modifiers {
659-
KeyModifiers::SHIFT => {
660-
self.modify_selection(Direction::Down)
661-
}
662-
KeyModifiers::CONTROL => {
663-
self.modify_selection(
664-
Direction::Down,
665-
);
666-
self.modify_selection(
667-
Direction::Down,
668-
);
669-
self.modify_selection(
670-
Direction::Down,
671-
);
672-
}
673-
KeyModifiers::NONE => {
674-
self.move_selection(ScrollType::Down);
675-
}
676-
_ => {}
677-
};
678-
Ok(true)
679-
}
680-
_ => Ok(false),
681-
};
682-
} else if let Event::Key(e) = ev {
634+
if let Event::Key(e) = ev {
683635
return if e == self.key_config.move_down {
684636
self.move_selection(ScrollType::Down);
685637
Ok(true)

src/components/filetree.rs

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ use crate::{
1515
};
1616
use anyhow::Result;
1717
use asyncgit::{hash, StatusItem, StatusItemType};
18-
use crossterm::event::{
19-
Event,
20-
MouseEventKind::{ScrollDown, ScrollUp},
21-
};
18+
use crossterm::event::Event;
2219
use std::{borrow::Cow, cell::Cell, convert::From, path::Path};
2320
use tui::{backend::Backend, layout::Rect, text::Span, Frame};
2421

@@ -396,17 +393,7 @@ impl Component for FileTreeComponent {
396393

397394
fn event(&mut self, ev: Event) -> Result<bool> {
398395
if self.focused {
399-
if let Event::Mouse(mouse_ev) = ev {
400-
return match mouse_ev.kind {
401-
ScrollUp => {
402-
Ok(self.move_selection(MoveSelection::Up))
403-
}
404-
ScrollDown => {
405-
Ok(self.move_selection(MoveSelection::Down))
406-
}
407-
_ => Ok(false),
408-
};
409-
} else if let Event::Key(e) = ev {
396+
if let Event::Key(e) = ev {
410397
return if e == self.key_config.move_down {
411398
Ok(self.move_selection(MoveSelection::Down))
412399
} else if e == self.key_config.move_up {

src/main.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ use clap::{
3535
};
3636
use crossbeam_channel::{tick, unbounded, Receiver, Select};
3737
use crossterm::{
38-
event::{DisableMouseCapture, EnableMouseCapture},
3938
terminal::{
4039
disable_raw_mode, enable_raw_mode, EnterAlternateScreen,
4140
LeaveAlternateScreen,
@@ -168,13 +167,11 @@ fn main() -> Result<()> {
168167
fn setup_terminal() -> Result<()> {
169168
enable_raw_mode()?;
170169
io::stdout().execute(EnterAlternateScreen)?;
171-
io::stdout().execute(EnableMouseCapture)?;
172170
Ok(())
173171
}
174172

175173
fn shutdown_terminal() -> Result<()> {
176174
io::stdout().execute(LeaveAlternateScreen)?;
177-
io::stdout().execute(DisableMouseCapture)?;
178175
disable_raw_mode()?;
179176
Ok(())
180177
}

0 commit comments

Comments
 (0)