Skip to content

fix: prevent ContainsIn flyout layout oscillation on low-perf devices #2176

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
gadfly3173 wants to merge 1 commit into
base: develop
Choose a base branch
from
+9 −11
Open

fix: prevent ContainsIn flyout layout oscillation on low-perf devices #2176

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
8 changes: 6 additions & 2 deletions src/Views/CommitBaseInfo.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,16 @@ private async void OnOpenContainsIn(object sender, RoutedEventArgs e)
{
if (DataContext is ViewModels.CommitDetail detail && sender is Button button)
{
var containsIn = await detail.GetRefsContainsThisCommitAsync();
if (containsIn is not { Count: > 0 } || !button.IsEffectivelyVisible)
return;

var tracking = new CommitRelationTracking();
tracking.SetData(containsIn);

var flyout = new Flyout();
flyout.Content = tracking;
flyout.ShowAt(button);

await tracking.SetDataAsync(detail);
}

e.Handled = true;
Expand Down
3 changes: 0 additions & 3 deletions src/Views/CommitRelationTracking.axaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:m="using:SourceGit.Models"
xmlns:v="using:SourceGit.Views"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
x:Class="SourceGit.Views.CommitRelationTracking">
<Grid RowDefinitions="Auto,Auto,Auto">
Expand All @@ -30,7 +29,5 @@
</ItemsControl.ItemTemplate>
</ItemsControl>
</ScrollViewer>

<v:LoadingIcon x:Name="LoadingIcon" Grid.Row="2" HorizontalAlignment="Center" Margin="0,8" Width="14" Height="14" IsVisible="False"/>
</Grid>
</UserControl>
9 changes: 3 additions & 6 deletions src/Views/CommitRelationTracking.axaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using System.Threading.Tasks;
using System.Collections.Generic;
using Avalonia.Controls;

namespace SourceGit.Views
Expand All @@ -10,12 +10,9 @@ public CommitRelationTracking()
InitializeComponent();
}

public async Task SetDataAsync(ViewModels.CommitDetail detail)
public void SetData(List<Models.Decorator> data)
{
LoadingIcon.IsVisible = true;
var containsIn = await detail.GetRefsContainsThisCommitAsync();
Container.ItemsSource = containsIn;
LoadingIcon.IsVisible = false;
Container.ItemsSource = data;
}
}
}