Skip to content

Fix: Resolve issue with column resizing #10952

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

Merged
merged 1 commit into from
Jan 8, 2023
+26 −15
Merged

Fix: Resolve issue with column resizing #10952

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
15 changes: 8 additions & 7 deletions src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,7 @@
ToolTipService.ToolTip="{x:Bind FileTagsUI[0].TagName, Mode=OneWay}"
Visibility="{x:Bind FileTagsUI, Converter={StaticResource EmptyObjectToObjectConverter}, Mode=OneWay}">
<TextBlock
x:Name="ItemTag"
FontSize="12"
Style="{StaticResource ColumnContentTextBlock}"
Text="{x:Bind FileTagsUI[0].TagName, Mode=OneWay}"
Expand All @@ -661,7 +662,7 @@
</Grid>

<TextBlock
x:Name="ItemOriginalPathGrid"
x:Name="ItemOriginalPath"
Width="{Binding ColumnsViewModel.OriginalPathColumn.LengthIncludingGridSplitter.Value, ElementName=PageRoot, Mode=OneWay}"
Padding="12,0,0,0"
HorizontalAlignment="Stretch"
Expand All @@ -671,7 +672,7 @@
Text="{x:Bind AsRecycleBinItem.ItemOriginalPath, Mode=OneWay}" />

<TextBlock
x:Name="ItemDateDeletedGrid"
x:Name="ItemDateDeleted"
Width="{Binding ColumnsViewModel.DateDeletedColumn.LengthIncludingGridSplitter.Value, ElementName=PageRoot, Mode=OneWay}"
Padding="12,0,0,0"
HorizontalAlignment="Stretch"
Expand All @@ -681,7 +682,7 @@
Text="{x:Bind AsRecycleBinItem.ItemDateDeleted, Mode=OneWay}" />

<TextBlock
x:Name="ItemDateModifiedGrid"
x:Name="ItemDateModified"
Width="{Binding ColumnsViewModel.DateModifiedColumn.LengthIncludingGridSplitter.Value, ElementName=PageRoot, Mode=OneWay}"
Padding="12,0,0,0"
HorizontalAlignment="Stretch"
Expand All @@ -691,7 +692,7 @@
Visibility="{Binding ColumnsViewModel.DateModifiedColumn.Visibility, ElementName=PageRoot, Mode=OneWay}" />

<TextBlock
x:Name="ItemDateCreatedGrid"
x:Name="ItemDateCreated"
Width="{Binding ColumnsViewModel.DateCreatedColumn.LengthIncludingGridSplitter.Value, ElementName=PageRoot, Mode=OneWay}"
Padding="12,0,0,0"
HorizontalAlignment="Stretch"
Expand All @@ -701,7 +702,7 @@
Visibility="{Binding ColumnsViewModel.DateCreatedColumn.Visibility, ElementName=PageRoot, Mode=OneWay}" />

<TextBlock
x:Name="ItemTypeGrid"
x:Name="ItemType"
Width="{Binding ColumnsViewModel.ItemTypeColumn.LengthIncludingGridSplitter.Value, ElementName=PageRoot, Mode=OneWay}"
Padding="12,0,0,0"
HorizontalAlignment="Stretch"
Expand All @@ -711,7 +712,7 @@
Visibility="{Binding ColumnsViewModel.ItemTypeColumn.Visibility, ElementName=PageRoot, Mode=OneWay}" />

<TextBlock
x:Name="ItemSizeGrid"
x:Name="ItemSize"
Width="{Binding ColumnsViewModel.SizeColumn.LengthIncludingGridSplitter.Value, ElementName=PageRoot, Mode=OneWay}"
Padding="12,0,0,0"
HorizontalAlignment="Stretch"
Expand All @@ -721,7 +722,7 @@
Visibility="{Binding ColumnsViewModel.SizeColumn.Visibility, ElementName=PageRoot, Mode=OneWay}" />

<FontIcon
x:Name="ItemStatusGrid"
x:Name="ItemStatus"
Width="{Binding ColumnsViewModel.StatusColumn.LengthIncludingGridSplitter.Value, ElementName=PageRoot, Mode=OneWay}"
Margin="12,0,0,0"
HorizontalAlignment="Stretch"
Expand Down
26 changes: 18 additions & 8 deletions src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,14 +740,24 @@ private double MeasureTextColumnEstimate(int columnIndex, int measureItemsCount,
{
var tbs = DependencyObjectHelpers.FindChildren<TextBlock>(FileList.ItemsPanelRoot).Where(tb =>
{
// isolated <TextBlock Grid.Column=...>
if (tb.ReadLocalValue(Grid.ColumnProperty) != DependencyProperty.UnsetValue)
return Grid.GetColumn(tb) == columnIndex;
// <TextBlock> nested in <Grid Grid.Column=...>
else if (tb.Parent is Grid parentGrid)
return Grid.GetColumn(parentGrid) == columnIndex;

return false;
int columnIndexFromName = tb.Name switch
{
"ItemName" => 1,
"ItemTag" => 2,
"ItemOriginalPath" => 3,
"ItemDateDeleted" => 4,
"ItemDateModified" => 5,
"ItemDateCreated" => 6,
"ItemType" => 7,
"ItemSize" => 8,
"ItemStatus" => 9,
_ => -1,
};

if (columnIndexFromName == -1)
return false;

return columnIndexFromName == columnIndex;
});

// heuristic: usually, text with more letters are wider than shorter text with wider letters
Expand Down