From 083e06c57c206c22f24e759b3996cb14bb011f27 Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Tue, 7 Jul 2020 13:26:08 +0200 Subject: [PATCH] fix: in revlog dont allow arrow-right when commit-details not open --- src/tabs/revlog.rs | 38 +++++++++++++++++++++++++------------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/src/tabs/revlog.rs b/src/tabs/revlog.rs index 463d7562..915bc881 100644 --- a/src/tabs/revlog.rs +++ b/src/tabs/revlog.rs @@ -171,19 +171,31 @@ impl Component for Revlog { if event_used { self.update()?; return Ok(true); - } else if let Event::Key(keys::LOG_COMMIT_DETAILS) = ev { - self.commit_details.toggle_visible()?; - self.update()?; - return Ok(true); - } else if let Event::Key(keys::FOCUS_RIGHT) = ev { - return if let Some(id) = self.selected_commit() { - self.queue - .borrow_mut() - .push_back(InternalEvent::InspectCommit(id)); - Ok(true) - } else { - Ok(false) - }; + } else { + match ev { + Event::Key(keys::LOG_COMMIT_DETAILS) => { + self.commit_details.toggle_visible()?; + self.update()?; + return Ok(true); + } + + Event::Key(keys::FOCUS_RIGHT) + if self.commit_details.is_visible() => + { + return if let Some(id) = + self.selected_commit() + { + self.queue.borrow_mut().push_back( + InternalEvent::InspectCommit(id), + ); + Ok(true) + } else { + Ok(false) + }; + } + + _ => (), + } } }