Skip to content

Fix: Fixed issue where tooltip in details layout was displaying the wrong data #12610

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
Jun 14, 2023
Merged

Fix: Fixed issue where tooltip in details layout was displaying the wrong data #12610

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
7 changes: 7 additions & 0 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 @@ -955,6 +955,7 @@
x:Name="ItemName"
Padding="6,0,0,0"
VerticalAlignment="Center"
DataContextChanged="TextBlock_DataContextChanged"
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
Opacity="{x:Bind Opacity, Mode=OneWay}"
Text="{x:Bind Name, Mode=OneWay}"
Expand Down Expand Up @@ -1104,6 +1105,7 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
x:Load="{x:Bind IsRecycleBinItem}"
DataContextChanged="TextBlock_DataContextChanged"
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
Style="{StaticResource ColumnContentTextBlock}"
Text="{x:Bind AsRecycleBinItem.ItemOriginalPath, Mode=OneWay}"
Expand All @@ -1117,6 +1119,7 @@
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
x:Load="{x:Bind IsRecycleBinItem}"
DataContextChanged="TextBlock_DataContextChanged"
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
Style="{StaticResource ColumnContentTextBlock}"
Text="{x:Bind AsRecycleBinItem.ItemDateDeleted, Mode=OneWay}"
Expand All @@ -1129,6 +1132,7 @@
Padding="10,0,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
DataContextChanged="TextBlock_DataContextChanged"
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
Style="{StaticResource ColumnContentTextBlock}"
Text="{x:Bind ItemDateModified, Mode=OneWay}"
Expand All @@ -1141,6 +1145,7 @@
Padding="10,0,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
DataContextChanged="TextBlock_DataContextChanged"
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
Style="{StaticResource ColumnContentTextBlock}"
Text="{x:Bind ItemDateCreated, Mode=OneWay}"
Expand All @@ -1153,6 +1158,7 @@
Padding="10,0,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
DataContextChanged="TextBlock_DataContextChanged"
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
Style="{StaticResource ColumnContentTextBlock}"
Text="{x:Bind ItemType, Mode=OneWay}"
Expand All @@ -1165,6 +1171,7 @@
Padding="10,0,0,0"
HorizontalAlignment="Stretch"
VerticalAlignment="Center"
DataContextChanged="TextBlock_DataContextChanged"
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
Style="{StaticResource ColumnContentTextBlock}"
Text="{x:Bind FileSize, Mode=OneWay}"
Expand Down
13 changes: 12 additions & 1 deletion 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 @@ -855,7 +855,18 @@ private void UpdateCheckboxVisibility(object sender, bool isPointerOver)
// Workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/170
private void TextBlock_IsTextTrimmedChanged(TextBlock sender, IsTextTrimmedChangedEventArgs e)
{
ToolTipService.SetToolTip(sender, sender.IsTextTrimmed ? sender.Text : null);
SetToolTip(sender);
}

private void TextBlock_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs e)
{
if (sender is TextBlock textBlock)
SetToolTip(textBlock);
}

private void SetToolTip(TextBlock textBlock)
{
ToolTipService.SetToolTip(textBlock, textBlock.IsTextTrimmed ? textBlock.Text : null);
}
}
}