Skip to content

bugfix for keyboard shortcuts #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mlange-42 merged 2 commits into from
Sep 29, 2022
Merged

bugfix for keyboard shortcuts #56

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a74cef2
bugfix
taro0079 Sep 29, 2022
67ca6b0
fix
taro0079 Sep 29, 2022
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
6 changes: 4 additions & 2 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use clap::{crate_version, App, Arg, SubCommand};
use crossterm::cursor::MoveToColumn;
use crossterm::event::{Event, KeyCode, KeyModifiers};
use crossterm::style::Print;
use crossterm::terminal::{Clear, ClearType};
use crossterm::terminal::{disable_raw_mode, enable_raw_mode, Clear, ClearType};
use crossterm::{ErrorKind, ExecutableCommand};
use git2::Repository;
use git_graph::config::{
Expand Down Expand Up @@ -441,7 +441,7 @@ fn print_paged(graph_lines: &[String], text_lines: &[String]) -> Result<(), Erro
let mut clear = false;
let mut abort = false;

let help = " >>> Down: line, PgDown/Enter: page, End: all, Esc/Q/^C: quit";
let help = "\r >>> Down: line, PgDown/Enter: page, End: all, Esc/Q/^C: quit\r";
let help = if help.len() > width {
&help[0..width]
} else {
Expand All @@ -467,6 +467,7 @@ fn print_paged(graph_lines: &[String], text_lines: &[String]) -> Result<(), Erro
print_lines -= 1;
line_idx += 1;
} else {
enable_raw_mode()?;
let input = crossterm::event::read()?;
match input {
Event::Key(evt) => match evt.code {
Expand Down Expand Up @@ -510,6 +511,7 @@ fn print_paged(graph_lines: &[String], text_lines: &[String]) -> Result<(), Erro
.execute(MoveToColumn(0))?
.execute(Print(" ...\n"))?;
}
disable_raw_mode()?;

Ok(())
}
Expand Down