extrawurst/gitui
1
1
Fork 0
mirror of https://github.com/extrawurst/gitui.git synced 2024-11-23 20:52:54 +03:00
Code Issues Projects Releases Wiki Activity

fix scroll command enbled

Browse Source
This commit is contained in:
Stephan Dilly 2020-03-19 01:33:08 +01:00
parent 10bb26e063
commit 6db11857e0
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app.rs
View File

@ -163,8 +163,10 @@ impl App {
.render(f, chunks[1]); .render(f, chunks[1]);
let mut cmds = self.commit.commands(); let mut cmds = self.commit.commands();
if !self.commit.is_visible() {
cmds.extend(self.index.commands()); cmds.extend(self.index.commands());
cmds.extend(self.index_wd.commands()); cmds.extend(self.index_wd.commands());
}
cmds.extend(self.commands()); cmds.extend(self.commands());
self.draw_commands(f, chunks_main[2], cmds); self.draw_commands(f, chunks_main[2], cmds);
@ -208,6 +210,7 @@ impl App {
return; return;
} }
if !self.commit.is_visible() {
if self.index.event(ev) { if self.index.event(ev) {
return; return;
} }
@ -215,7 +218,6 @@ impl App {
return; return;
} }
if !self.commit.is_visible() {
if ev == Event::Key(KeyCode::Esc.into()) if ev == Event::Key(KeyCode::Esc.into())
|| ev == Event::Key(KeyCode::Char('q').into()) || ev == Event::Key(KeyCode::Char('q').into())
{ {

2
src/components/index.rs
View File

@ -88,7 +88,7 @@ impl Component for IndexComponent {
if self.focused { if self.focused {
return vec![CommandInfo { return vec![CommandInfo {
name: "Scroll [↑↓]".to_string(), name: "Scroll [↑↓]".to_string(),
enabled: self.items.len() > 0, enabled: self.items.len() > 1,
}]; }];
} }