Skip to content

Fix: Fixed an issue where checkbox settings weren't applied in the grid layout #12229

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 12 commits into from
Apr 30, 2023
Merged

Fix: Fixed an issue where checkbox settings weren't applied in the grid layout #12229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9451a35
Show checkboxes when selecting items is now applying in the grid layouts
Krytan Apr 28, 2023
2c3f12b
Can now see checkboxes when hovering with the mouse if see checkboxes…
Krytan Apr 29, 2023
c95135f
grid layouts have now the same behavior as details layout
Krytan Apr 30, 2023
f202947
Merge branch 'main' into main
Krytan Apr 30, 2023
4d5e99f
grid layouts have now the same behavior as details layout
Krytan Apr 30, 2023
e138bd9
fixed xaml format
Krytan Apr 30, 2023
eb537c1
GridViewBrwoser.xaml formated
Krytan Apr 30, 2023
09aa5ac
Tiles layout now have the proper behavior
Krytan Apr 30, 2023
b2aa8da
Merge branch 'main' into main
Krytan Apr 30, 2023
41059ae
FilesLauncher reverted
Krytan Apr 30, 2023
7df9f6d
Merge branch 'main' of https://github.com/Krytan/Files
Krytan Apr 30, 2023
10268e0
Update src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
Krytan Apr 30, 2023
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
14 changes: 8 additions & 6 deletions src/Files.App/Views/LayoutModes/GridViewBrowser.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,10 +219,11 @@
Padding="0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
AutomationProperties.AccessibilityView="Raw"
Checked="ItemSelected_Checked"
DoubleTapped="SelectionCheckbox_DoubleTapped"
Unchecked="ItemSelected_Unchecked"
Visibility="Collapsed" />
Opacity="0"
Unchecked="ItemSelected_Unchecked" />

<Popup x:Name="EditPopup" Grid.Row="1">
<TextBox
Expand All @@ -243,7 +244,7 @@
<VisualState x:Name="HideCheckbox" />
<VisualState x:Name="ShowCheckbox">
<VisualState.Setters>
<Setter Target="SelectionCheckbox.Visibility" Value="Visible" />
<Setter Target="SelectionCheckbox.Opacity" Value="1" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
Expand Down Expand Up @@ -302,10 +303,11 @@
Padding="0"
HorizontalAlignment="Left"
VerticalAlignment="Top"
AutomationProperties.AccessibilityView="Raw"
Checked="ItemSelected_Checked"
DoubleTapped="SelectionCheckbox_DoubleTapped"
Unchecked="ItemSelected_Unchecked"
Visibility="Collapsed" />
Opacity="0"
Unchecked="ItemSelected_Unchecked" />

<Grid
Grid.Column="1"
Expand Down Expand Up @@ -446,7 +448,7 @@
<VisualState x:Name="HideCheckbox" />
<VisualState x:Name="ShowCheckbox">
<VisualState.Setters>
<Setter Target="SelectionCheckbox.Visibility" Value="Visible" />
<Setter Target="SelectionCheckbox.Opacity" Value="1" />
</VisualState.Setters>
</VisualState>
</VisualStateGroup>
Expand Down
38 changes: 19 additions & 19 deletions src/Files.App/Views/LayoutModes/GridViewBrowser.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,16 +434,18 @@ checkBox.DataContext is ListedItem item &&

private new void FileList_ContainerContentChanging(ListViewBase sender, ContainerContentChangingEventArgs args)
{
args.ItemContainer.PointerEntered -= ItemRow_PointerEntered;
args.ItemContainer.PointerExited -= ItemRow_PointerExited;
args.ItemContainer.PointerCanceled -= ItemRow_PointerCanceled;
var selectionCheckbox = args.ItemContainer.FindDescendant("SelectionCheckbox")!;

selectionCheckbox.PointerEntered -= SelectionCheckbox_PointerEntered;
selectionCheckbox.PointerExited -= SelectionCheckbox_PointerExited;
selectionCheckbox.PointerCanceled -= SelectionCheckbox_PointerCanceled;

base.FileList_ContainerContentChanging(sender, args);
SetCheckboxSelectionState(args.Item, args.ItemContainer as GridViewItem);

args.ItemContainer.PointerEntered += ItemRow_PointerEntered;
args.ItemContainer.PointerExited += ItemRow_PointerExited;
args.ItemContainer.PointerCanceled += ItemRow_PointerCanceled;
selectionCheckbox.PointerEntered += SelectionCheckbox_PointerEntered;
selectionCheckbox.PointerExited += SelectionCheckbox_PointerExited;
selectionCheckbox.PointerCanceled += SelectionCheckbox_PointerCanceled;
}

private void SetCheckboxSelectionState(object item, GridViewItem? lviContainer = null)
Expand All @@ -464,7 +466,7 @@ private void SetCheckboxSelectionState(object item, GridViewItem? lviContainer =
checkbox.Unchecked += ItemSelected_Unchecked;
}

UpdateCheckboxVisibility(container);
UpdateCheckboxVisibility(container, checkbox?.IsPointerOver ?? false);
}
}

Expand All @@ -481,37 +483,35 @@ private void Grid_Loaded(object sender, RoutedEventArgs e)
itemContainer.ContextFlyout = ItemContextMenuFlyout;
}

private void ItemRow_PointerEntered(object sender, PointerRoutedEventArgs e)
private void SelectionCheckbox_PointerEntered(object sender, PointerRoutedEventArgs e)
{
UpdateCheckboxVisibility(sender, true);
UpdateCheckboxVisibility((sender as FrameworkElement)!.FindAscendant<GridViewItem>()!, true);
}

private void ItemRow_PointerExited(object sender, PointerRoutedEventArgs e)
private void SelectionCheckbox_PointerExited(object sender, PointerRoutedEventArgs e)
{
UpdateCheckboxVisibility(sender, false);
UpdateCheckboxVisibility((sender as FrameworkElement)!.FindAscendant<GridViewItem>()!, false);
}

private void ItemRow_PointerCanceled(object sender, PointerRoutedEventArgs e)
private void SelectionCheckbox_PointerCanceled(object sender, PointerRoutedEventArgs e)
{
UpdateCheckboxVisibility(sender, false);
UpdateCheckboxVisibility((sender as FrameworkElement)!.FindAscendant<GridViewItem>()!, false);
}

private void UpdateCheckboxVisibility(object sender, bool? isPointerOver = null)
private void UpdateCheckboxVisibility(object sender, bool isPointerOver)
{
if (sender is GridViewItem control && control.FindDescendant<UserControl>() is UserControl userControl)
{
// Save pointer over state accordingly
if (isPointerOver.HasValue)
control.SetValue(IsPointerOverProperty, isPointerOver);
// Handle visual states
// Show checkboxes when items are selected (as long as the setting is enabled)
// Show checkboxes when hovering of the item (regardless of the setting to hide them)
// Show checkboxes when hovering over the checkbox area (regardless of the setting to hide them)
if (UserSettingsService.FoldersSettingsService.ShowCheckboxesWhenSelectingItems && control.IsSelected
|| control.GetValue(IsPointerOverProperty) is not false)
|| isPointerOver)
VisualStateManager.GoToState(userControl, "ShowCheckbox", true);
else
VisualStateManager.GoToState(userControl, "HideCheckbox", true);
}
}

}
}