Skip to content

fix(inspect): hide file edit hint when viewing commit message (#1645) #2940

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

Open
leno23 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(inspect): hide file edit hint when viewing commit message (#1645) #2940

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 30 additions & 7 deletions src/components/commit_details/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use super::{
Component, DrawableComponent, EventState, StatusTreeComponent,
};
use crate::{
accessors,
app::Environment,
keys::{key_match, SharedKeyConfig},
strings,
Expand Down Expand Up @@ -36,7 +35,13 @@ pub struct CommitDetailsComponent {
}

impl CommitDetailsComponent {
accessors!(self, [single_details, compare_details, file_tree]);
fn components_mut(&mut self) -> Vec<&mut dyn Component> {
if self.is_compare() {
vec![&mut self.compare_details, &mut self.file_tree]
} else {
vec![&mut self.single_details, &mut self.file_tree]
}
}

///
pub fn new(env: &Environment) -> Self {
Expand Down Expand Up @@ -185,11 +190,29 @@ impl Component for CommitDetailsComponent {
force_all: bool,
) -> CommandBlocking {
if self.visible || force_all {
command_pump(
out,
force_all,
self.components().as_slice(),
);
if self.details_focused() || force_all {
if self.is_compare() {
command_pump(
out,
force_all,
&[&self.compare_details as &dyn Component],
);
} else {
command_pump(
out,
force_all,
&[&self.single_details as &dyn Component],
);
}
}

if self.file_tree.focused() || force_all {
command_pump(
out,
force_all,
&[&self.file_tree as &dyn Component],
);
}
}

CommandBlocking::PassingOn
Expand Down