Ensure Ribbon Shadow Isn't Stored When Not Available

Author: lukeblevins

Files UWP/GenericFileBrowser.xaml

@@ -287,7 +287,7 @@
                 <controls:DataGridTemplateColumn IsReadOnly="True">
                     <controls:DataGridTemplateColumn.CellTemplate>
                         <DataTemplate>
-                            <Grid Name="Icon" Margin="15, 0, 0, 0">
+                            <Grid Name="Icon" Margin="0, 0, 0, 0">
                                 <Rectangle Visibility="Collapsed" Name="CutIndicator" Opacity="0.1" Fill="LightGray"/>
                                 <FontIcon Visibility="{Binding FolderImg}" Glyph="&#xE8D5;" FontFamily="Segoe MDL2 Assets" Foreground="#ffe793"/>
                                 <FontIcon Visibility="{Binding EmptyImgVis}" Glyph="&#xE7C3;" FontFamily="Segoe MDL2 Assets"/>

Files UWP/PhotoAlbum.xaml

@@ -400,10 +400,10 @@
         <ProgressBar Name="ProgBar" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
         <TextBlock Visibility="{x:Bind TextState.isVisible, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" Name="EmptyText" HorizontalAlignment="Center" Text="This folder is empty." TextWrapping="Wrap" VerticalAlignment="Top" Margin="0,125,0,0" Grid.Row="3" Canvas.ZIndex="0"/>
 
-        <controls:AdaptiveGridView StretchContentForSingleRow="False" DesiredWidth="150" VerticalContentAlignment="Stretch" ItemHeight="150" animations:ReorderGridAnimation.Duration="300" ShowsScrollingPlaceholders="True" Margin="24,24,24,0" Grid.Row="3" SelectionMode="Extended" IsRightTapEnabled="True" IsDoubleTapEnabled="True" Name="FileList" Padding="0, 0, 0, 0" >
+        <controls:AdaptiveGridView RightTapped="FileList_RightTapped" StretchContentForSingleRow="False" DesiredWidth="150" VerticalContentAlignment="Stretch" ItemHeight="150" animations:ReorderGridAnimation.Duration="300" ShowsScrollingPlaceholders="True" Margin="24,24,24,0" Grid.Row="3" SelectionMode="Extended" IsRightTapEnabled="True" IsDoubleTapEnabled="True" Name="FileList" Padding="0, 0, 0, 0" >
             <controls:AdaptiveGridView.ItemTemplate>
                 <DataTemplate>
-                    <StackPanel Orientation="Vertical" Padding="0" ToolTipService.ToolTip="{Binding FileName}" Background="Transparent" IsRightTapEnabled="True" Margin="0, 0, 0, 0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
+                    <StackPanel Tag="{Binding RowIndex}" RightTapped="StackPanel_RightTapped" Orientation="Vertical" Padding="0" ToolTipService.ToolTip="{Binding FileName}" Background="Transparent" IsRightTapEnabled="True" Margin="0, 0, 0, 0" HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
                         <StackPanel.ContextFlyout>
                             <MenuFlyout x:Name="RightClickContextMenu" MenuFlyoutPresenterStyle="{StaticResource MenuFlyoutFluentThemeResources}">
                                 <MenuFlyout.Items>

Files UWP/PhotoAlbum.xaml.cs

@@ -15,13 +15,16 @@
 using System.Diagnostics;
 using Windows.UI.Xaml.Media.Animation;
 using System.ComponentModel;
+using System.Collections.ObjectModel;
+using System.Collections.Generic;
+using Windows.UI.Xaml.Data;
 
 namespace Files
 {
 
     public sealed partial class PhotoAlbum : Page
     {
-        public GridView gv;
+        public AdaptiveGridView gv;
         public Image largeImg;
         public MenuFlyout context;
         public MenuFlyout gridContext;
@@ -213,5 +216,46 @@ internal void TextState_PropertyChanged(object sender, PropertyChangedEventArgs
         {
             TextState.isVisible = ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().TextState.isVisible;
         }
+
+
+        private void StackPanel_RightTapped(object sender, RightTappedRoutedEventArgs e)
+        {
+            //ObjectPressed = ((ReadOnlyObservableCollection<ListedItem>)FileList.ItemsSource)[(int)(sender as StackPanel).Tag];
+        }
+
+        private void FileList_RightTapped(object sender, RightTappedRoutedEventArgs e)
+        {
+            var ItemPressed = Interaction<PhotoAlbum>.FindParent<GridViewItem>(e.OriginalSource as DependencyObject);
+            List<StackPanel> stackPanels = new List<StackPanel>();
+            Interaction<PhotoAlbum>.FindChildren<StackPanel>(stackPanels, ItemPressed);
+            var ObjectPressed = ((ReadOnlyObservableCollection<ListedItem>)FileList.ItemsSource)[(int) stackPanels[0].Tag];
+            //List<int> indexes = new List<int>();
+            //foreach (ItemIndexRange range in FileList.SelectedRanges)
+            //{
+            //    for (int x = range.FirstIndex; x <= range.LastIndex; x++) { indexes.Add(x); }
+            //}
+            List<GridViewItem> items = new List<GridViewItem>();
+            List<GridViewItem> selitems = new List<GridViewItem>();
+            Interaction<PhotoAlbum>.FindChildren<GridViewItem>(items, FileList);
+            foreach (GridViewItem gvi in items)
+            {
+                if (gvi.IsSelected)
+                {
+                    selitems.Add(gvi);
+                }
+            }
+            
+            foreach (GridViewItem selectedItem in selitems)
+            {
+                if (FileList.IndexFromContainer(FileList.ContainerFromItem(selectedItem)) == FileList.IndexFromContainer(FileList.ContainerFromItem(ItemPressed)))
+                {
+                    return;
+                }
+            }
+
+            // The following code is only reachable when a user RightTapped an unselected row
+            FileList.SelectedItems.Clear();
+            FileList.SelectedItems.Add(ObjectPressed);
+        }
     }
 }

Files UWP/ProHome.xaml.cs

@@ -90,8 +90,12 @@ public ProHome()
             BackButton.Click += NavigationActions.Back_Click;
             ForwardButton.Click += NavigationActions.Forward_Click;
             RefreshButton.Click += NavigationActions.Refresh_Click;
-            ribbonShadow.Receivers.Add(RibbonShadowSurface);
-            Ribbon.Translation += new System.Numerics.Vector3(0, 0, 4);
+            if(ribbonShadow != null)
+            {
+                ribbonShadow.Receivers.Add(RibbonShadowSurface);
+                Ribbon.Translation += new System.Numerics.Vector3(0, 0, 4);
+            }
+
 
         }