Skip to content

Commit feee91f

Browse files
committed
Fix hover on empty space
1 parent df41321 commit feee91f

File tree

4 files changed

+13
-12
lines changed

4 files changed

+13
-12
lines changed

src/Files.App/BaseLayout.cs

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -897,11 +897,19 @@ protected void FileList_ContainerContentChanging(ListViewBase sender, ContainerC
897897

898898
private void RefreshContainer(SelectorItem container, bool inRecycleQueue)
899899
{
900+
container.PointerEntered -= ListedItem_PointerEntered;
901+
container.PointerExited -= ListedItem_PointerExited;
900902
container.PointerPressed -= FileListItem_PointerPressed;
901903
if (inRecycleQueue)
902-
UninitializeDrag(container);
904+
{
905+
UninitializeDrag(container);
906+
}
903907
else
908+
{
909+
container.PointerEntered += ListedItem_PointerEntered;
910+
container.PointerExited += ListedItem_PointerExited;
904911
container.PointerPressed += FileListItem_PointerPressed;
912+
}
905913
}
906914

907915
private void RefreshItem(SelectorItem container, object item, bool inRecycleQueue, ContainerContentChangingEventArgs args)
@@ -952,7 +960,7 @@ protected internal void ListedItem_PointerEntered(object sender, PointerRoutedEv
952960
if (!UserSettingsService.PreferencesSettingsService.SelectFilesOnHover)
953961
return;
954962

955-
var hovered = (sender as Grid)?.DataContext as ListedItem;
963+
var hovered = GetItemFromElement(sender);
956964
if (hovered != hoveredItem)
957965
{
958966
hoveredItem = hovered;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@
192192
CornerRadius="{StaticResource ControlCornerRadius}"
193193
IsRightTapEnabled="True"
194194
Loaded="Grid_Loaded"
195-
PointerEntered="ListedItem_PointerEntered"
196-
PointerExited="ListedItem_PointerExited"
197195
RightTapped="StackPanel_RightTapped"
198196
ToolTipService.ToolTip="{x:Bind ItemName, Mode=OneWay}">
199197
<Grid.ColumnDefinitions>

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -507,8 +507,6 @@
507507
AutomationProperties.Name="{x:Bind ItemName, Mode=OneWay}"
508508
IsRightTapEnabled="True"
509509
Loaded="Grid_Loaded"
510-
PointerEntered="ListedItem_PointerEntered"
511-
PointerExited="ListedItem_PointerExited"
512510
RightTapped="StackPanel_RightTapped"
513511
ToolTipService.ToolTip="{x:Bind ItemTooltipText, Mode=OneWay}">
514512
<Grid.ColumnDefinitions>

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@
6262
Background="Transparent"
6363
IsRightTapEnabled="True"
6464
Loaded="Grid_Loaded"
65-
PointerEntered="ListedItem_PointerEntered"
66-
PointerExited="ListedItem_PointerExited"
6765
RightTapped="StackPanel_RightTapped"
6866
ToolTipService.ToolTip="{x:Bind ItemTooltipText, Mode=OneWay}">
6967
<Grid.RowDefinitions>
@@ -208,15 +206,14 @@
208206
<DataTemplate x:Name="TilesBrowserTemplate" x:DataType="local2:ListedItem">
209207
<Grid
210208
MaxHeight="68"
211-
Padding="8,4"
212-
HorizontalAlignment="Stretch"
209+
Margin="8,4"
210+
Padding="0"
211+
HorizontalAlignment="Left"
213212
VerticalAlignment="Stretch"
214213
Background="Transparent"
215214
ColumnSpacing="4"
216215
IsRightTapEnabled="True"
217216
Loaded="Grid_Loaded"
218-
PointerEntered="ListedItem_PointerEntered"
219-
PointerExited="ListedItem_PointerExited"
220217
RightTapped="StackPanel_RightTapped"
221218
ToolTipService.ToolTip="{x:Bind ItemTooltipText, Mode=OneWay}">
222219
<Grid.ColumnDefinitions>

0 commit comments

Comments
 (0)