Minor updatees.

This commit is contained in:
2025-03-22 01:55:22 -04:00
parent 9214e97100
commit 9b80bf4a98
5 changed files with 304 additions and 92 deletions

View File

@@ -7,7 +7,6 @@
xmlns:controls="clr-namespace:Harmonia.UI.Controls"
mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
DataContext="{x:Static vm:ViewModelLocator.PlaylistViewModel}"
Loaded="OnLoaded"
x:Class="Harmonia.UI.Views.PlaylistView"
x:DataType="vm:PlaylistViewModel">
<UserControl.Resources>
@@ -42,7 +41,7 @@
</Style>
<Style Selector="Grid.Playing TextBlock">
<Setter Property="Foreground" Value="#76b9ed"/>
<Setter Property="Foreground" Value="{StaticResource HighlightTextColor}"/>
<!-- Light Blue for Highlight -->
</Style>
</UserControl.Styles>
@@ -59,9 +58,9 @@
</Grid.ColumnDefinitions>
<TextBox Grid.Column="0" HorizontalAlignment="Stretch" Watermark="Filter" Text="{Binding Filter, Mode=TwoWay}"></TextBox>
<StackPanel Grid.Column="1" Orientation="Horizontal">
<Button Foreground="#7FD184" Margin="10 0 0 0">
<Button Classes="Flat" Foreground="#7FD184" Margin="10 0 0 0" CornerRadius="32">
<Button.Content>
<PathIcon Data="{StaticResource SemiIconPlus}"></PathIcon>
<PathIcon Classes="FlatButtonIcon" Foreground="#7FD184" Data="{StaticResource SemiIconPlus}"></PathIcon>
</Button.Content>
<Button.Flyout>
<controls:AnimatedMenuFlyout Placement="Bottom">
@@ -84,9 +83,9 @@
</controls:AnimatedMenuFlyout>
</Button.Flyout>
</Button>
<Button Foreground="#F9F9F9" Margin="10 0 0 0">
<Button Classes="Flat" Foreground="#F9F9F9" Margin="10 0 0 0" CornerRadius="32">
<Button.Content>
<PathIcon Data="{StaticResource SemiIconMore}"></PathIcon>
<PathIcon Classes="FlatButtonIcon" Data="{StaticResource SemiIconMore}"></PathIcon>
</Button.Content>
<Button.Flyout>
<controls:AnimatedMenuFlyout Placement="Bottom">
@@ -150,6 +149,7 @@
ItemsSource="{Binding FilteredPlaylistSongs, Mode=OneWay}"
SelectedItems="{Binding SelectedPlaylistSongs, Mode=OneWay}"
DragDrop.AllowDrop="True"
DragDrop.Drop="OnPlaylistListBoxDrop"
DoubleTapped="ListBox_DoubleTapped"
SelectionMode="Multiple">
<!--<ListBox.Styles>
@@ -164,7 +164,7 @@
</ListBox.Styles>-->
<ListBox.ItemTemplate>
<DataTemplate>
<Grid Classes.Playing="{Binding $parent[ListBox].((vm:PlaylistViewModel)DataContext).PlayingSong, Converter={StaticResource PlaylistSongEquality}, ConverterParameter={Binding .}}">
<Grid Loaded="Grid_Loaded">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="70"></ColumnDefinition>
<ColumnDefinition Width="*"></ColumnDefinition>