Skip to content

Commit f16859d

Browse files
committed
Enable Ribbon for PhotoAlbum Items
1 parent 51bde0e commit f16859d

File tree

3 files changed

+20
-34
lines changed

3 files changed

+20
-34
lines changed

Files UWP/GenericFileBrowser.xaml.cs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,14 +233,18 @@ private void GenericItemView_PointerReleased(object sender, Windows.UI.Xaml.Inpu
233233

234234
private void AllView_SelectionChanged(object sender, SelectionChangedEventArgs e)
235235
{
236-
237236
AllView.CommitEdit();
238237
if(e.AddedItems.Count > 0)
239238
{
240239
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = true;
241240
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = true;
242241

243242
}
243+
else if(data.SelectedItems.Count == 0)
244+
{
245+
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = false;
246+
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = false;
247+
}
244248
}
245249

246250
private void NameDialog_Loaded(object sender, RoutedEventArgs e)

Files UWP/PhotoAlbum.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@
405405
<ProgressBar Name="ProgBar" Height="10" VerticalAlignment="Top" IsIndeterminate="True"/>
406406
<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"/>
407407

408-
<GridView Name="FileList" Margin="24,24,24,0" SelectionMode="Extended" ItemsSource="{x:Bind instanceViewModel.FilesAndFolders}" VerticalContentAlignment="Stretch" animations:ReorderGridAnimation.Duration="300">
408+
<GridView SelectionChanged="FileList_SelectionChanged" Name="FileList" Margin="24,24,24,0" SelectionMode="Extended" ItemsSource="{x:Bind instanceViewModel.FilesAndFolders}" VerticalContentAlignment="Stretch" animations:ReorderGridAnimation.Duration="300">
409409
<GridView.ItemContainerStyle>
410410
<Style TargetType="GridViewItem">
411411
<Setter Property="ContextFlyout">

Files UWP/PhotoAlbum.xaml.cs

Lines changed: 14 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -235,46 +235,28 @@ private void StackPanel_RightTapped(object sender, RightTappedRoutedEventArgs e)
235235
FileList.SelectedItems.Add(FileList.ItemFromContainer(parentContainer) as ListedItem);
236236
}
237237

238-
private void FileList_RightTapped(object sender, RightTappedRoutedEventArgs e)
238+
private void PhotoAlbumViewer_PointerPressed(object sender, PointerRoutedEventArgs e)
239239
{
240-
try
241-
{
242-
var ItemPressed = Interaction<PhotoAlbum>.FindParent<GridViewItem>(e.OriginalSource as DependencyObject);
243-
List<StackPanel> stackPanels = new List<StackPanel>();
244-
Interaction<PhotoAlbum>.FindChildren<StackPanel>(stackPanels, ItemPressed);
245-
var indexOfObjectPressed = FileList.IndexFromContainer(FileList.ContainerFromItem(ItemPressed));
246-
foreach (ListedItem selectedItem in (sender as GridView).SelectedItems)
247-
{
248-
if (selectedItem.RowIndex == indexOfObjectPressed)
249-
{
250-
return;
251-
}
252-
}
253-
254-
// The following code is only reachable when a user RightTapped an unselected row
255-
FileList.SelectedItems.Clear();
256-
FileList.SelectedItems.Add(instanceViewModel.FilesAndFolders[indexOfObjectPressed]);
257-
}
258-
catch (ArgumentException)
240+
if (e.GetCurrentPoint(sender as Page).Properties.IsLeftButtonPressed)
259241
{
260-
return;
242+
FileList.SelectedItem = null;
243+
ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = false;
244+
ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = false;
261245
}
262-
263246
}
264247

265-
266-
private void FileList_ContextRequested(UIElement sender, ContextRequestedEventArgs args)
248+
private void FileList_SelectionChanged(object sender, SelectionChangedEventArgs e)
267249
{
250+
if (e.AddedItems.Count > 0)
251+
{
252+
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = true;
253+
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = true;
268254

269-
}
270-
271-
private void PhotoAlbumViewer_PointerPressed(object sender, PointerRoutedEventArgs e)
272-
{
273-
if (e.GetCurrentPoint(sender as Page).Properties.IsLeftButtonPressed)
255+
}
256+
else if (FileList.SelectedItems.Count == 0)
274257
{
275-
FileList.SelectedItem = null;
276-
ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = false;
277-
ItemViewModel<PhotoAlbum>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = false;
258+
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().HomeItems.isEnabled = false;
259+
ItemViewModel<GenericFileBrowser>.GetCurrentSelectedTabInstance<ProHome>().ShareItems.isEnabled = false;
278260
}
279261
}
280262
}

0 commit comments

Comments
 (0)