Skip to content

Give more space to right-side diff view #2772

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Give more space to right-side diff view #2772

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* increase MSRV from 1.81 to 1.82 [[@cruessler](https://github.com/cruessler)]

### Added
* Give more space to right-side diff view [[@hongquan](https://github.com/hongquan)] ([#2772](https://github.com/gitui-org/gitui/pull/2772))
* Support pre-push hook [[@xlai89](https://github.com/xlai89)] ([#1933](https://github.com/extrawurst/gitui/issues/1933))
* Message tab supports pageUp and pageDown [[@xlai89](https://github.com/xlai89)] ([#2623](https://github.com/extrawurst/gitui/issues/2623))
* Files and status tab support pageUp and pageDown [[@fatpandac](https://github.com/fatpandac)] ([#1951](https://github.com/extrawurst/gitui/issues/1951))
Expand Down
44 changes: 22 additions & 22 deletions src/popups/inspect_commit.rs
View file
Open in desktop
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 {
..80 => [
Constraint::Percentage(50),
Constraint::Percentage(50),
],
80..100 => [Constraint::Max(32), Constraint::Fill(1)],
100..120 => [Constraint::Max(40), Constraint::Fill(1)],
120..140 => [Constraint::Max(48), Constraint::Fill(1)],
_ => [Constraint::Max(52), 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