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

fix branchname width misalignment

Browse source
This commit is contained in:
Stephan Dilly 2021-04-06 18:41:59 +02:00
parent b5f1e76455
commit 6f722b4806
1 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/components/branchlist.rs
View file

@ -49,8 +49,8 @@ impl DrawableComponent for BranchListComponent {
rect: Rect,
) -> Result<()> {
if self.visible {
const PERCENT_SIZE: Size = Size::new(60, 25);
const MIN_SIZE: Size = Size::new(50, 20);
const PERCENT_SIZE: Size = Size::new(80, 25);
const MIN_SIZE: Size = Size::new(60, 20);
let area = ui::centered_rect(
PERCENT_SIZE.width,
@ -338,9 +338,8 @@ impl BranchListComponent {
const IS_HEAD_STAR_LENGTH: usize = 3; // "* "
const THREE_DOTS_LENGTH: usize = 3; // "..."
// branch name = 30% of area size
let branch_name_length: usize =
width_available as usize * 30 / 100;
width_available as usize * 40 / 100;
// commit message takes up the remaining width
let commit_message_length: usize = (width_available as usize)
.saturating_sub(COMMIT_HASH_LENGTH)
@ -367,11 +366,16 @@ impl BranchListComponent {
}
let mut branch_name = displaybranch.name.clone();
if branch_name.len() > branch_name_length {
branch_name.unicode_truncate(
branch_name_length
.saturating_sub(THREE_DOTS_LENGTH),
);
if branch_name.len()
> branch_name_length.saturating_sub(THREE_DOTS_LENGTH)
{
branch_name = branch_name
.unicode_truncate(
branch_name_length
.saturating_sub(THREE_DOTS_LENGTH),
)
.0
.to_string();
branch_name += "...";
}