Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## Unreleased

### Changed
* Give more space to right-side diff view [[@hongquan](https://github.com/hongquan)] ([#2772](https://github.com/gitui-org/gitui/pull/2772))
* use [tombi](https://github.com/tombi-toml/tombi) for all toml file formatting
* open the external editor from the status diff view [[@WaterWhisperer](https://github.com/WaterWhisperer)] ([#2805](https://github.com/gitui-org/gitui/issues/2805))

Expand Down
44 changes: 22 additions & 22 deletions src/popups/inspect_commit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -67,29 +67,29 @@ pub struct InspectCommitPopup {

impl DrawableComponent for InspectCommitPopup {
fn draw(&self, f: &mut Frame, rect: Rect) -> Result<()> {
if self.is_visible() {
let percentages = if self.diff.focused() {
(0, 100)
} else {
(50, 50)
};

let chunks = Layout::default()
.direction(Direction::Horizontal)
.constraints(
[
Constraint::Percentage(percentages.0),
Constraint::Percentage(percentages.1),
]
.as_ref(),
)
.split(rect);

f.render_widget(Clear, rect);

self.details.draw(f, chunks[0])?;
self.diff.draw(f, chunks[1])?;
if !self.is_visible() {
return Ok(());
}
let constraints = match rect.width {
..64 => [
Constraint::Percentage(50),
Constraint::Percentage(50),
],
64..100 => [Constraint::Max(32), Constraint::Fill(1)],
100..120 => [Constraint::Max(38), Constraint::Fill(1)],
120..152 => [Constraint::Max(42), Constraint::Fill(1)],
_ => [Constraint::Max(50), Constraint::Fill(1)],
};

let chunks = Layout::default()
.direction(Direction::Horizontal)
.constraints(constraints)
.split(rect);

f.render_widget(Clear, rect);

self.details.draw(f, chunks[0])?;
self.diff.draw(f, chunks[1])?;

Ok(())
}
Expand Down