Skip to content

Commit 6553e27

Browse files
committed
refactor: rewrite the way to get local & remote branch tree height
1 parent 8faa8c7 commit 6553e27

File tree

1 file changed

+10
-19
lines changed

1 file changed

+10
-19
lines changed

src/Views/Repository.axaml.cs

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -404,29 +404,20 @@ private void OnDashboardLayoutUpdated(object sender, EventArgs e)
404404
worktreeList.Height = desiredHeight;
405405
}
406406

407-
var desiredLocalBranchHeight = GetTreeRowsCount(vm.LocalBranchTrees) * 24;
408-
var desiredRemoteHeight = GetTreeRowsCount(vm.RemoteBranchTrees) * 24;
409-
410-
if (!vm.IsRemoteGroupExpanded)
407+
if (vm.IsLocalBranchGroupExpanded)
411408
{
412-
if (vm.IsLocalBranchGroupExpanded)
413-
{
414-
var localBranchHeight = Math.Min(leftHeight, desiredLocalBranchHeight);
409+
var localBranchMax = vm.IsRemoteGroupExpanded ? leftHeight * 0.5 : leftHeight;
410+
var desiredHeight = GetTreeRowsCount(vm.LocalBranchTrees) * 24;
411+
var localBranchHeight = Math.Min(localBranchMax, desiredHeight);
412+
if (!localBranchTree.Height.IsClose(localBranchHeight))
415413
localBranchTree.Height = localBranchHeight;
416-
}
414+
leftHeight -= localBranchHeight;
417415
}
418-
else
419-
{
420-
if (vm.IsLocalBranchGroupExpanded)
421-
{
422-
var localBranchHeight = Math.Min(leftHeight * 0.5, desiredLocalBranchHeight);
423-
if (!localBranchTree.Height.IsClose(localBranchHeight))
424-
localBranchTree.Height = localBranchHeight;
425-
426-
leftHeight -= localBranchHeight;
427-
}
428416

429-
var remoteHeight = Math.Min(leftHeight, desiredRemoteHeight);
417+
if (vm.IsRemoteGroupExpanded)
418+
{
419+
var desiredHeight = GetTreeRowsCount(vm.RemoteBranchTrees) * 24;
420+
var remoteHeight = Math.Min(leftHeight, desiredHeight);
430421
if (!remoteBranchTree.Height.IsClose(remoteHeight))
431422
remoteBranchTree.Height = remoteHeight;
432423
}

0 commit comments

Comments
 (0)