Skip to content
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

Improve UX by freezing the first two columns. #29

Merged
merged 1 commit into from
Nov 11, 2023
Merged

Improve UX by freezing the first two columns. #29

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
2 changes: 1 addition & 1 deletion src/View/DependencyTree/DependencyTreeViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ public ChildNode(PackageInfo packageInfo, IReadOnlyDictionary<PackageInfo, HashS
_packageInfo = packageInfo;
_parentsByChild = parentsByChild;

parentsByChild.TryGetValue(_packageInfo, out _dependsOn);
parentsByChild.TryGetValue(packageInfo, out _dependsOn);
}

public PackageIdentity PackageIdentity => _packageInfo.PackageIdentity;
Expand Down
43 changes: 20 additions & 23 deletions src/View/Monitor/NuGetMonitorControl.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,8 +60,20 @@
BorderThickness="0 1 0 0"
Style="{DynamicResource {x:Static styles:ResourceKeys.DataGridStyle}}"
VerticalContentAlignment="Center"
FrozenColumnCount="2"
dgx:DataGridFilter.IsAutoFilterEnabled="True"
toms:MultiSelectorExtensions.SelectionBinding="{Binding SelectedPackages}">
<DataGrid.Resources>
<toms:BindingRelay x:Key="DataGridRelay" DataContext="{Binding ElementName=DataGrid}" />
<Style TargetType="DataGridCell" x:Key="InfoColumnCellStyle">
<Style.Triggers>
<DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType=DataGridRow}}" Value="True">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" />
</DataTrigger>
</Style.Triggers>
</Style>
</DataGrid.Resources>
<DataGrid.CellStyle>
<Style TargetType="DataGridCell" BasedOn="{StaticResource {x:Static styles:ResourceKeys.DataGridCellStyle}}">
<Style.Triggers>
Expand Down Expand Up @@ -180,17 +192,8 @@
Binding="{Binding Justifications}"
dgx:DataGridFilterColumn.IsFilterVisible="False" />
<DataGridTemplateColumn Header="Projects"
dgx:DataGridFilterColumn.IsFilterVisible="False">
<DataGridTemplateColumn.CellStyle>
<Style TargetType="DataGridCell">
<Style.Triggers>
<DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType=DataGridRow}}" Value="True">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" />
</DataTrigger>
</Style.Triggers>
</Style>
</DataGridTemplateColumn.CellStyle>
dgx:DataGridFilterColumn.IsFilterVisible="False"
CellStyle="{StaticResource InfoColumnCellStyle}">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<ItemsControl ItemsSource="{Binding Projects}">
Expand All @@ -213,27 +216,21 @@
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<DataGridTemplateColumn Header="Project URL"
dgx:DataGridFilterColumn.IsFilterVisible="False">
<DataGridTemplateColumn.CellStyle>
<Style TargetType="DataGridCell">
<Style.Triggers>
<DataTrigger Binding="{Binding IsSelected, RelativeSource={RelativeSource FindAncestor, AncestorType=DataGridRow}}" Value="True">
<Setter Property="Background" Value="Transparent" />
<Setter Property="BorderBrush" Value="Transparent" />
</DataTrigger>
</Style.Triggers>
</Style>
</DataGridTemplateColumn.CellStyle>
dgx:DataGridFilterColumn.IsFilterVisible="False"
CellStyle="{StaticResource InfoColumnCellStyle}">
<DataGridTemplateColumn.CellTemplate>
<DataTemplate>
<TextBlock Margin="2,0" VerticalAlignment="Center">
<Hyperlink Command="{Binding OpenProjectUrlCommand}">
<Run Text="{Binding PackageInfo.ProjectUrl, Mode=OneWay}" />
<Run Text="{Binding PackageInfo.ProjectUrl, Mode=OneWay, FallbackValue=''}" />
</Hyperlink>
</TextBlock>
</DataTemplate>
</DataGridTemplateColumn.CellTemplate>
</DataGridTemplateColumn>
<!-- Add an extra padding column, so we can always scroll to the last column. -->
<DataGridTextColumn Width="{Binding DataContext.(DataGrid.ActualWidth), Source={StaticResource DataGridRelay}}"
dgx:DataGridFilterColumn.IsFilterVisible="False" />
</DataGrid.Columns>
</DataGrid>

Expand Down