Skip to content

Commit b08b728

Browse files
committed
Do not directly reference packagelist methods from xaml, use x:bind instead
1 parent 09a0872 commit b08b728

3 files changed

Lines changed: 30 additions & 16 deletions

File tree

src/UniGetUI/Controls/PackageWrapper.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using System.Collections.Concurrent;
22
using System.ComponentModel;
33
using System.Runtime.InteropServices;
4+
using Microsoft.UI.Xaml.Input;
45
using Microsoft.UI.Xaml.Media;
56
using Microsoft.UI.Xaml.Media.Imaging;
67
using UniGetUI.Core.Classes;
@@ -78,7 +79,17 @@ public PackageWrapper(IPackage package, AbstractPackagesPage page)
7879
ExtendedTooltip = $"{package.Name} (from {package.Source.AsString_DisplayName})";
7980
}
8081

81-
public async void RightClick()
82+
public void PackageItemContainer_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
83+
=> _page.PackageItemContainer_DoubleTapped(sender, e);
84+
85+
public void PackageItemContainer_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
86+
=> _page.PackageItemContainer_PreviewKeyDown(sender, e);
87+
88+
public void PackageItemContainer_RightTapped(object sender, RightTappedRoutedEventArgs e)
89+
=> _page.PackageItemContainer_RightTapped(sender, e);
90+
91+
92+
public async Task RightClick()
8293
{
8394
await _page.ShowContextMenu(this);
8495
}

src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,12 @@
3535
<widgets:PackageItemContainer
3636
AutomationProperties.Name="{x:Bind Package.AutomationName}"
3737
CornerRadius="4"
38-
DoubleTapped="PackageItemContainer_DoubleTapped"
39-
Package="{x:Bind Package}"
40-
PreviewKeyDown="PackageItemContainer_PreviewKeyDown"
41-
RightTapped="PackageItemContainer_RightTapped"
42-
Wrapper="{x:Bind Self}">
38+
DoubleTapped="{x:Bind PackageItemContainer_DoubleTapped}"
39+
PreviewKeyDown="{x:Bind PackageItemContainer_PreviewKeyDown}"
40+
RightTapped="{x:Bind PackageItemContainer_RightTapped}"
41+
42+
Wrapper="{x:Bind Self}"
43+
Package="{x:Bind Package}">
4344

4445
<Grid
4546
Padding="12,3,8,3"
@@ -210,10 +211,11 @@
210211
AutomationProperties.Name="{x:Bind Package.AutomationName}"
211212
Background="{ThemeResource ControlFillColorDefaultBrush}"
212213
CornerRadius="4"
213-
DoubleTapped="PackageItemContainer_DoubleTapped"
214+
DoubleTapped="{x:Bind PackageItemContainer_DoubleTapped}"
215+
PreviewKeyDown="{x:Bind PackageItemContainer_PreviewKeyDown}"
216+
RightTapped="{x:Bind PackageItemContainer_RightTapped}"
217+
214218
Package="{x:Bind Package}"
215-
PreviewKeyDown="PackageItemContainer_PreviewKeyDown"
216-
RightTapped="PackageItemContainer_RightTapped"
217219
Wrapper="{x:Bind Self}">
218220

219221
<Grid
@@ -328,10 +330,11 @@
328330
AutomationProperties.Name="{x:Bind Package.AutomationName}"
329331
Background="{ThemeResource ControlFillColorDefaultBrush}"
330332
CornerRadius="4"
331-
DoubleTapped="PackageItemContainer_DoubleTapped"
333+
DoubleTapped="{x:Bind PackageItemContainer_DoubleTapped}"
334+
PreviewKeyDown="{x:Bind PackageItemContainer_PreviewKeyDown}"
335+
RightTapped="{x:Bind PackageItemContainer_RightTapped}"
336+
332337
Package="{x:Bind Package}"
333-
PreviewKeyDown="PackageItemContainer_PreviewKeyDown"
334-
RightTapped="PackageItemContainer_RightTapped"
335338
Wrapper="{x:Bind Self}">
336339

337340
<Grid

src/UniGetUI/Pages/SoftwarePages/AbstractPackagesPage.xaml.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ protected void PerformMainPackageAction(IPackage? package)
978978
}
979979

980980
public void FocusPackageList()
981-
{ CurrentPackageList.Focus(FocusState.Programmatic); }
981+
=> CurrentPackageList.Focus(FocusState.Programmatic);
982982

983983

984984
public async Task ShowContextMenu(PackageWrapper wrapper)
@@ -990,7 +990,7 @@ public async Task ShowContextMenu(PackageWrapper wrapper)
990990
WhenShowingContextMenu(wrapper.Package);
991991
}
992992

993-
private void PackageItemContainer_RightTapped(object sender, RightTappedRoutedEventArgs e)
993+
public void PackageItemContainer_RightTapped(object sender, RightTappedRoutedEventArgs e)
994994
{
995995
if (sender is PackageItemContainer container && container.Package is not null)
996996
{
@@ -1000,7 +1000,7 @@ private void PackageItemContainer_RightTapped(object sender, RightTappedRoutedEv
10001000
}
10011001
}
10021002

1003-
private void PackageItemContainer_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
1003+
public void PackageItemContainer_DoubleTapped(object sender, DoubleTappedRoutedEventArgs e)
10041004
{
10051005
if (sender is PackageItemContainer container && container.Package is not null)
10061006
{
@@ -1138,7 +1138,7 @@ public void OnLeave()
11381138
IsEnabled = false;
11391139
}
11401140

1141-
private void PackageItemContainer_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
1141+
public void PackageItemContainer_PreviewKeyDown(object sender, KeyRoutedEventArgs e)
11421142
{
11431143
if (e.Key is not (VirtualKey.Up or VirtualKey.Down or VirtualKey.Home or VirtualKey.End or VirtualKey.Enter or VirtualKey.Space) ||
11441144
sender is not PackageItemContainer packageItemContainer)

0 commit comments

Comments
 (0)