chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18 from irihitech/rc

Browse Source 
feat: upgrade to rc1.1
This commit is contained in:
Dong Bin
2023-06-21 20:30:46 +08:00
committed by GitHub
parent e0c59799ad 2e40bcf0f6
commit f4bb4d379e
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
demo/Ursa.Demo/Ursa.Demo.csproj
View File

@@ -19,12 +19,12 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview7" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-preview7" />
<PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.0-rc1.1" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-preview7" />
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="11.0.0-rc1.1" />
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
<PackageReference Include="Semi.Avalonia" Version="0.1.0-preview7" />
<PackageReference Include="Semi.Avalonia" Version="11.0.0-rc1" />
</ItemGroup>
<ItemGroup>

2
src/Ursa.Themes.Semi/Ursa.Themes.Semi.csproj
View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview7" />
<PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
</ItemGroup>
<ItemGroup>

20
src/Ursa/Controls/IPv4Box.cs
View File

@@ -120,7 +120,7 @@ public class IPv4Box: TemplatedControl
protected override void OnKeyDown(KeyEventArgs e)
{
if (_currentActivePresenter is null) return;
var keymap = AvaloniaLocator.Current.GetRequiredService<PlatformHotkeyConfiguration>();
var keymap = TopLevel.GetTopLevel(this)?.PlatformSettings?.HotkeyConfiguration;
bool Match(List<KeyGesture> gestures) => gestures.Any(g => g.Matches(e));
if (e.Key == Key.Enter)
{
@@ -129,17 +129,17 @@ public class IPv4Box: TemplatedControl
base.OnKeyDown(e);
return;
}
if (Match(keymap.SelectAll))
if (keymap is not null && Match(keymap.SelectAll))
{
_currentActivePresenter.SelectionStart = 0;
_currentActivePresenter.SelectionEnd = _currentActivePresenter.Text?.Length ?? 0;
return;
}
else if (Match(keymap.Copy))
else if (keymap is not null && Match(keymap.Copy))
{
Copy();
}
else if (Match(keymap.Paste))
else if (keymap is not null && Match(keymap.Paste))
{
Paste();
}
@@ -494,17 +494,17 @@ public class IPv4Box: TemplatedControl
public async void Copy()
{
string s = string.Join(".", _firstText?.Text, _secondText?.Text, _thirdText?.Text, _fourthText?.Text);
IClipboard? clipboard = AvaloniaLocator.Current.GetService<IClipboard>();
IClipboard? clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
clipboard?.SetTextAsync(s);
}
public static KeyGesture? CopyKeyGesture { get; } = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>()?.Copy.FirstOrDefault();
public static KeyGesture? PasteKeyGesture { get; } = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>()?.Paste.FirstOrDefault();
public static KeyGesture? CutKeyGesture { get; } = AvaloniaLocator.Current.GetService<PlatformHotkeyConfiguration>()?.Cut.FirstOrDefault();
public static KeyGesture? CopyKeyGesture { get; } = Application.Current?.PlatformSettings?.HotkeyConfiguration.Copy.FirstOrDefault();
public static KeyGesture? PasteKeyGesture { get; } = Application.Current?.PlatformSettings?.HotkeyConfiguration.Paste.FirstOrDefault();
public static KeyGesture? CutKeyGesture { get; } = Application.Current?.PlatformSettings?.HotkeyConfiguration.Cut.FirstOrDefault();
public async void Paste()
{
IClipboard? clipboard = AvaloniaLocator.Current.GetService<IClipboard>();
IClipboard? clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
if (clipboard is null) return;
string s = await clipboard.GetTextAsync();
if (IPAddress.TryParse(s, out var address))
@@ -515,7 +515,7 @@ public class IPv4Box: TemplatedControl
public async void Cut()
{
IClipboard? clipboard = AvaloniaLocator.Current.GetService<IClipboard>();
IClipboard? clipboard = TopLevel.GetTopLevel(this)?.Clipboard;
if(clipboard is null) return;
string s = string.Join(".", _firstText?.Text, _secondText?.Text, _thirdText?.Text, _fourthText?.Text);
await clipboard.SetTextAsync(s);

2
src/Ursa/Ursa.csproj
View File

@@ -8,7 +8,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Avalonia" Version="11.0.0-preview7" />
<PackageReference Include="Avalonia" Version="11.0.0-rc1.1" />
</ItemGroup>
<ItemGroup>