Skip to content

Commit 7ded84b

Browse files
authored
Fix: Fixed issue where tooltip in details layout was displaying the wrong data (#12610)
1 parent 093995d commit 7ded84b

File tree

2 files changed

+19
-1
lines changed

2 files changed

+19
-1
lines changed

src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -955,6 +955,7 @@
955955
x:Name="ItemName"
956956
Padding="6,0,0,0"
957957
VerticalAlignment="Center"
958+
DataContextChanged="TextBlock_DataContextChanged"
958959
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
959960
Opacity="{x:Bind Opacity, Mode=OneWay}"
960961
Text="{x:Bind Name, Mode=OneWay}"
@@ -1104,6 +1105,7 @@
11041105
HorizontalAlignment="Stretch"
11051106
VerticalAlignment="Center"
11061107
x:Load="{x:Bind IsRecycleBinItem}"
1108+
DataContextChanged="TextBlock_DataContextChanged"
11071109
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
11081110
Style="{StaticResource ColumnContentTextBlock}"
11091111
Text="{x:Bind AsRecycleBinItem.ItemOriginalPath, Mode=OneWay}"
@@ -1117,6 +1119,7 @@
11171119
HorizontalAlignment="Stretch"
11181120
VerticalAlignment="Center"
11191121
x:Load="{x:Bind IsRecycleBinItem}"
1122+
DataContextChanged="TextBlock_DataContextChanged"
11201123
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
11211124
Style="{StaticResource ColumnContentTextBlock}"
11221125
Text="{x:Bind AsRecycleBinItem.ItemDateDeleted, Mode=OneWay}"
@@ -1129,6 +1132,7 @@
11291132
Padding="10,0,0,0"
11301133
HorizontalAlignment="Stretch"
11311134
VerticalAlignment="Center"
1135+
DataContextChanged="TextBlock_DataContextChanged"
11321136
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
11331137
Style="{StaticResource ColumnContentTextBlock}"
11341138
Text="{x:Bind ItemDateModified, Mode=OneWay}"
@@ -1141,6 +1145,7 @@
11411145
Padding="10,0,0,0"
11421146
HorizontalAlignment="Stretch"
11431147
VerticalAlignment="Center"
1148+
DataContextChanged="TextBlock_DataContextChanged"
11441149
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
11451150
Style="{StaticResource ColumnContentTextBlock}"
11461151
Text="{x:Bind ItemDateCreated, Mode=OneWay}"
@@ -1153,6 +1158,7 @@
11531158
Padding="10,0,0,0"
11541159
HorizontalAlignment="Stretch"
11551160
VerticalAlignment="Center"
1161+
DataContextChanged="TextBlock_DataContextChanged"
11561162
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
11571163
Style="{StaticResource ColumnContentTextBlock}"
11581164
Text="{x:Bind ItemType, Mode=OneWay}"
@@ -1165,6 +1171,7 @@
11651171
Padding="10,0,0,0"
11661172
HorizontalAlignment="Stretch"
11671173
VerticalAlignment="Center"
1174+
DataContextChanged="TextBlock_DataContextChanged"
11681175
IsTextTrimmedChanged="TextBlock_IsTextTrimmedChanged"
11691176
Style="{StaticResource ColumnContentTextBlock}"
11701177
Text="{x:Bind FileSize, Mode=OneWay}"

src/Files.App/Views/LayoutModes/DetailsLayoutBrowser.xaml.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,18 @@ private void UpdateCheckboxVisibility(object sender, bool isPointerOver)
855855
// Workaround for https://github.com/microsoft/microsoft-ui-xaml/issues/170
856856
private void TextBlock_IsTextTrimmedChanged(TextBlock sender, IsTextTrimmedChangedEventArgs e)
857857
{
858-
ToolTipService.SetToolTip(sender, sender.IsTextTrimmed ? sender.Text : null);
858+
SetToolTip(sender);
859+
}
860+
861+
private void TextBlock_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs e)
862+
{
863+
if (sender is TextBlock textBlock)
864+
SetToolTip(textBlock);
865+
}
866+
867+
private void SetToolTip(TextBlock textBlock)
868+
{
869+
ToolTipService.SetToolTip(textBlock, textBlock.IsTextTrimmed ? textBlock.Text : null);
859870
}
860871
}
861872
}

0 commit comments

Comments
 (0)