Fixed crash when right clicking in PlaylistView

thecodrr · Oct 27, 2016 · a8cee48 · a8cee48
1 parent 9643151
commit a8cee48
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 11 deletions.
diff --git a/BreadPlayer.Core/Behaviours/OpenMenuBehaviour.cs b/BreadPlayer.Core/Behaviours/OpenMenuBehaviour.cs
@@ -51,14 +51,14 @@ public object Execute(object sender, object parameter)
             FrameworkElement senderElement = sender as FrameworkElement;
             var navList = senderElement.GetFirstAncestorOfType<NavMenuListView>() != null && senderElement.GetFirstAncestorOfType<NavMenuListView>().Name == "PlaylistsMenuList" ? senderElement.GetFirstAncestorOfType<NavMenuListView>() : null;
             ListViewItem item = senderElement.GetFirstAncestorOfType<ListViewItem>();
-            var ListBox = item.GetFirstAncestorOfType<ListView>();
+            var ListView = item.GetFirstAncestorOfType<ListView>();
             // if (item != null) item.IsSelected = true;
             ListViewItem listItem = senderElement.Tag is ContentPresenter ? (senderElement.Tag as ContentPresenter).Tag as ListViewItem : null;
             if(listItem != null) listItem.IsSelected = true;
             //var items = //((Parameter as Binding).Path as ListViewItem);
             if (Parameter.ToString() == "BindableFlyout")
             {
-                if (ListBox?.SelectedItems.Count == 1) { ListBox.SelectedIndex = -1; }
+                if (ListView?.SelectedItems.Count == 1) { ListView.SelectedIndex = -1; }
                 if (item != null) item.IsSelected = true;
                 var flyout = (senderElement as Button).GetAncestorsOfType<Grid>().Where(t => t.Name == "LayoutRoot").ToList()[0].Resources["PlaylistsFlyout"] as BindableFlyout;
                 flyout.ShowAt(senderElement);
@@ -74,7 +74,7 @@ public object Execute(object sender, object parameter)
             }
             else
             {
-                ListBox.SelectedIndex = -1;
+                ListView.SelectedIndex = -1;
                 if (item != null) item.IsSelected = true;
                 var flyout = senderElement.Resources["Flyout"] as MenuFlyout; //.GetFirstDescendantOfType<Grid>().Resources["Flyout"] as MenuFlyout;
                 flyout.ShowAt(senderElement, senderElement.GetPointerPosition());

diff --git a/BreadPlayer.Core/ViewModels/PlaylistViewModel.cs b/BreadPlayer.Core/ViewModels/PlaylistViewModel.cs
@@ -218,14 +218,14 @@ public ICommand InitCommand
             get
             { if (_initCommand == null) { _initCommand = new RelayCommand(param => this.Init(param)); } return _initCommand; }
         }
-        public ListBox PlaylistSongsListBox;
+        public ListView PlaylistSongsListBox;
         bool _isPageLoaded;
         public bool IsPageLoaded { get { return _isPageLoaded; } set { Set(ref _isPageLoaded, value); } }
         void Init(object para)
         {
             IsPageLoaded = true;
             var childern = para as UIElementCollection;
-            var fileBox = childern.OfType<ListBox>().ToList()[0];
+            var fileBox = childern.OfType<ListView>().ToList()[0];
             PlaylistSongsListBox = fileBox;
         }
     }

diff --git a/BreadPlayer.Core/ViewModels/ShellViewModel.cs b/BreadPlayer.Core/ViewModels/ShellViewModel.cs
@@ -115,15 +115,15 @@ void PlayNext()
 
             }
         }
-        ListBox GetListBox()
+        ListView GetListBox()
         {
             if (PlaylistVM.IsPageLoaded)
             {
                 return PlaylistVM.PlaylistSongsListBox;
             }
             else
             {
-                return null; //LibVM.FileListBox;
+                return LibVM.FileListBox;
             }
         }
         void PlayPrevious()

diff --git a/BreadPlayer.Core/Views/PlaylistView.xaml b/BreadPlayer.Core/Views/PlaylistView.xaml
@@ -10,7 +10,7 @@
     mc:Ignorable="d">
     <Page.Resources>
 
-        <Style TargetType="ListBoxItem" x:Key="CustomPlaylistItemStyle">
+        <Style TargetType="ListViewItem" x:Key="CustomPlaylistItemStyle">
             <Setter Property="Background" Value="Transparent" />
             <Setter Property="TabNavigation" Value="Local" />
             <Setter Property="Padding" Value="0" />
@@ -19,7 +19,7 @@
 
             <Setter Property="Template">
                 <Setter.Value>
-                    <ControlTemplate TargetType="ListBoxItem">
+                    <ControlTemplate TargetType="ListViewItem">
                         <Grid DataContext="{Binding Source={StaticResource Core}, Path=LibVM}"
           x:Name="LayoutRoot"
           Background="{TemplateBinding Background}"
@@ -99,6 +99,14 @@
                                         <VisualState.Setters>
                                             <Setter Target="PressedBackground.Fill" Value="{ThemeResource HoverBrush}"/>
                                         </VisualState.Setters>
+                                        <VisualState.Storyboard>
+                                            <Storyboard>
+                                                <ObjectAnimationUsingKeyFrames Storyboard.TargetName="DataStack"
+                                               Storyboard.TargetProperty="CanDrag">
+                                                    <DiscreteObjectKeyFrame KeyTime="0" Value="True" />
+                                                </ObjectAnimationUsingKeyFrames>
+                                            </Storyboard>
+                                        </VisualState.Storyboard>
                                     </VisualState>
                                     <VisualState x:Name="SelectedUnfocused">
                                         <VisualState.Setters>
@@ -115,7 +123,7 @@
                                             </Storyboard>
                                         </VisualState.Storyboard>
                                     </VisualState>
-                                    <VisualState x:Name="SelectedPointerOver">
+                                    <VisualState x:Name="PointerOverSelected">
                                         <VisualState.Setters>
                                             <Setter Target="DataStack.Foreground" Value="{ThemeResource PointerOverBrush}"/>
                                             <Setter Target="titleTxt.MaxWidth" Value="190"/>
@@ -146,6 +154,32 @@
                                         </VisualState.Storyboard>
                                     </VisualState>
                                 </VisualStateGroup>
+                                <VisualStateGroup>
+                                    <VisualState>
+                                        <VisualState.StateTriggers>
+                                            <AdaptiveTrigger MinWindowWidth="0"/>
+                                        </VisualState.StateTriggers>
+                                        <VisualState.Setters>
+                                            <Setter Target="artistTxt.Visibility" Value="Collapsed"/>
+                                            <Setter Target="albumTxt.Visibility" Value="Collapsed"/>
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState>
+                                        <VisualState.StateTriggers>
+                                            <AdaptiveTrigger MinWindowWidth="800"/>
+                                        </VisualState.StateTriggers>
+                                        <VisualState.Setters></VisualState.Setters>
+                                    </VisualState>
+                                    <VisualState>
+                                        <VisualState.StateTriggers>
+                                            <AdaptiveTrigger MinWindowWidth="500"/>
+                                        </VisualState.StateTriggers>
+                                        <VisualState.Setters>
+                                            <Setter Target="artistTxt.Visibility" Value="Visible"/>
+                                            <Setter Target="albumTxt.Visibility" Value="Collapsed"/>
+                                        </VisualState.Setters>
+                                    </VisualState>
+                                </VisualStateGroup>
                             </VisualStateManager.VisualStateGroups>
                             <Rectangle
             x:Name="PressedBackground"
@@ -246,7 +280,7 @@
                 </StackPanel>
             </Grid>
         </Grid>
-        <ListBox x:Name="playListBox" Grid.Row="1" Background="{ThemeResource ThemeBackground}" VerticalAlignment="Top" ScrollViewer.VerticalScrollBarVisibility="Auto" ItemContainerStyle="{StaticResource CustomPlaylistItemStyle}"></ListBox>
+        <ListView x:Name="playListBox" Grid.Row="1" Background="{ThemeResource ThemeBackground}" VerticalAlignment="Top" ScrollViewer.VerticalScrollBarVisibility="Auto" ItemContainerStyle="{StaticResource CustomPlaylistItemStyle}"></ListView>
         <Interactivity:Interaction.Behaviors>
             <Core:EventTriggerBehavior EventName="Loaded">
                 <Core:InvokeCommandAction Command="{Binding InitCommand}" CommandParameter="{Binding ElementName=Grid, Path=Children}"/>