Skip to content

Commit b3b7098

Browse files
style: add ListView style and improve the extension (#624)
* move extensions out of the controls folder * add media ListView style and enhance the ListView extension * minor list view extension comments tweaks * store dependency properties values * improve ListViewExtensions nullable support * use nullable value types for properties --------- Co-authored-by: Tung Huynh <[email protected]>
1 parent 67215ab commit b3b7098

20 files changed

+339
-118
lines changed

Screenbox/Controls/Extensions/ListViewExtensions.cs

Lines changed: 0 additions & 65 deletions
This file was deleted.

Screenbox/Controls/PlaylistView.xaml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
xmlns:ctAnimations="using:CommunityToolkit.WinUI.Animations"
88
xmlns:ctConverters="using:CommunityToolkit.WinUI.Converters"
99
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
10-
xmlns:extensions="using:Screenbox.Controls.Extensions"
10+
xmlns:extensions="using:Screenbox.Extensions"
1111
xmlns:helpers="using:Screenbox.Helpers"
1212
xmlns:interactions="using:Screenbox.Controls.Interactions"
1313
xmlns:interactivity="using:Microsoft.Xaml.Interactivity"
@@ -290,8 +290,6 @@
290290
Grid.Row="1"
291291
Margin="{StaticResource TopMediumMargin}"
292292
Padding="{x:Bind Padding, Mode=OneWay}"
293-
extensions:ListViewExtensions.ItemCornerRadius="{StaticResource MediaItemCornerRadius}"
294-
extensions:ListViewExtensions.ItemMargin="0,2,0,2"
295293
ui:ListViewExtensions.ItemContainerStretchDirection="Horizontal"
296294
ui:ScrollViewerExtensions.VerticalScrollBarMargin="{x:Bind Common.ScrollBarMargin, Mode=OneWay}"
297295
AllowDrop="True"
@@ -300,11 +298,11 @@
300298
DragOver="PlaylistListView_OnDragOver"
301299
Drop="PlaylistListView_OnDrop"
302300
IsItemClickEnabled="True"
303-
ItemContainerStyle="{StaticResource MediaListViewItemStyle}"
304301
ItemsSource="{x:Bind ViewModel.Playlist.Items}"
305302
KeyboardAcceleratorPlacementMode="Hidden"
306303
SelectionChanged="PlaylistListView_OnSelectionChanged"
307-
SelectionMode="Extended">
304+
SelectionMode="Extended"
305+
Style="{StaticResource MediaListViewStyle}">
308306
<ListView.Resources>
309307
<x:Boolean x:Key="ListViewItemSelectionIndicatorVisualEnabled">False</x:Boolean>
310308
</ListView.Resources>

Screenbox/Controls/Extensions/ApplicationViewExtensions.cs renamed to Screenbox/Extensions/ApplicationViewExtensions.cs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,16 @@
1-
using Windows.UI.ViewManagement;
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
// Source: https://github.com/CommunityToolkit/WindowsCommunityToolkit/blob/main/Microsoft.Toolkit.Uwp.UI/Extensions/ApplicationViewExtensions.cs
5+
6+
using Windows.UI.ViewManagement;
27
using Windows.UI.Xaml.Controls;
38

4-
namespace Screenbox.Controls.Extensions;
9+
namespace Screenbox.Extensions;
10+
11+
/// <summary>
12+
/// Provides attached properties for interacting with the <see cref="Windows.UI.ViewManagement.ApplicationView"/> on a window (app view).
13+
/// </summary>
514
public static class ApplicationViewExtensions
615
{
716
/// <summary>

Screenbox/Controls/Extensions/CommandBarExtensions.cs renamed to Screenbox/Extensions/CommandBarExtensions.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
using Windows.UI.Xaml;
33
using Windows.UI.Xaml.Controls;
44

5-
namespace Screenbox.Controls.Extensions;
5+
namespace Screenbox.Extensions;
66

77
/// <summary>
88
/// Provides attached dependency properties for the <see cref="CommandBar"/> control.

0 commit comments

Comments
 (0)