Elgato_dark/gitui
1
0
Fork 0
mirror of https://github.com/gitui-org/gitui synced 2026-05-24 01:18:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge a678ae6be6 into 8619c07f3f

Browse source
This commit is contained in:
吴杨帆 2026-05-17 17:52:32 +08:00 committed by GitHub
commit d7391bd4d6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/components/commit_details/mod.rs
View file

@ -7,7 +7,6 @@ use super::{
Component, DrawableComponent, EventState, StatusTreeComponent,
};
use crate::{
accessors,
app::Environment,
keys::{key_match, SharedKeyConfig},
strings,
@ -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 {
@ -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