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

Merge pull request #721 from irihitech/revert_ime

Browse Source 
Revert "feat: add ime fix in new version."
This commit is contained in:
Zhang Dian
2025-07-10 17:00:05 +08:00
committed by GitHub
parent e025b489e2 5ee0dfd638
commit 6337d50c40
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Ursa.sln
View File

@@ -42,8 +42,8 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Action", "GitHub Action", "{66123AC1-7C8C-4AA0-BBDB-5CC3E647A741}" Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "GitHub Action", "GitHub Action", "{66123AC1-7C8C-4AA0-BBDB-5CC3E647A741}"
ProjectSection(SolutionItems) = preProject ProjectSection(SolutionItems) = preProject
.github\workflows\deploy.yml = .github\workflows\deploy.yml .github\workflows\deploy.yml = .github\workflows\deploy.yml
.github\workflows\pack-nightly.yml = .github\workflows\pack-nightly.yml
.github\workflows\pack.yml = .github\workflows\pack.yml .github\workflows\pack.yml = .github\workflows\pack.yml
.github\workflows\pack-nightly.yml = .github\workflows\pack-nightly.yml
.github\workflows\publish.yml = .github\workflows\publish.yml .github\workflows\publish.yml = .github\workflows\publish.yml
.github\workflows\release-tag.yml = .github\workflows\release-tag.yml .github\workflows\release-tag.yml = .github\workflows\release-tag.yml
.github\workflows\test.yml = .github\workflows\test.yml .github\workflows\test.yml = .github\workflows\test.yml
@@ -69,7 +69,6 @@ Global
{53B5F277-3AEB-4661-ACAE-15CFFF2ED800}.Release|Any CPU.Build.0 = Release|Any CPU {53B5F277-3AEB-4661-ACAE-15CFFF2ED800}.Release|Any CPU.Build.0 = Release|Any CPU
{3FC76CD9-CE5D-4804-A8D6-4E292EB296AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {3FC76CD9-CE5D-4804-A8D6-4E292EB296AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3FC76CD9-CE5D-4804-A8D6-4E292EB296AA}.Debug|Any CPU.Build.0 = Debug|Any CPU {3FC76CD9-CE5D-4804-A8D6-4E292EB296AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3FC76CD9-CE5D-4804-A8D6-4E292EB296AA}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
{3FC76CD9-CE5D-4804-A8D6-4E292EB296AA}.Release|Any CPU.ActiveCfg = Release|Any CPU {3FC76CD9-CE5D-4804-A8D6-4E292EB296AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3FC76CD9-CE5D-4804-A8D6-4E292EB296AA}.Release|Any CPU.Build.0 = Release|Any CPU {3FC76CD9-CE5D-4804-A8D6-4E292EB296AA}.Release|Any CPU.Build.0 = Release|Any CPU
{B6BAB821-A9FE-44F3-B9CD-06E27FDB63F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B6BAB821-A9FE-44F3-B9CD-06E27FDB63F6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU

2
src/Package.props
View File

@@ -1,7 +1,7 @@
<Project> <Project>
<PropertyGroup> <PropertyGroup>
<Version>1.11.1</Version> <Version>1.11.1</Version>
<AvaloniaVersion>11.1.3</AvaloniaVersion> <AvaloniaVersion>11.1.1</AvaloniaVersion>
<Authors>IRIHI Technology Co., Ltd.</Authors> <Authors>IRIHI Technology Co., Ltd.</Authors>
<RepositoryUrl>https://github.com/irihitech/Ursa.Avalonia</RepositoryUrl> <RepositoryUrl>https://github.com/irihitech/Ursa.Avalonia</RepositoryUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression> <PackageLicenseExpression>MIT</PackageLicenseExpression>

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

@@ -283,13 +283,11 @@ public class IPv4Box: TemplatedControl
{ {
if (e.ClickCount == 1) if (e.ClickCount == 1)
{ {
_imClient.ShowInputPanel();
_imClient.SetPresenter(presenter); _imClient.SetPresenter(presenter);
presenter.ShowCaret(); presenter.ShowCaret();
_currentActivePresenter = presenter; _currentActivePresenter = presenter;
var caretPosition = position.WithX(position.X - presenter.Bounds.X); var caretPosition = position.WithX(position.X - presenter.Bounds.X);
presenter.MoveCaretToPoint(caretPosition); presenter.MoveCaretToPoint(caretPosition);
} }
else if (e.ClickCount == 2) else if (e.ClickCount == 2)
{ {

1
src/Ursa/Controls/IPv4Box/IPv4BoxInputMethodClient.cs
View File

@@ -2,7 +2,6 @@ using Avalonia;
using Avalonia.Controls.Presenters; using Avalonia.Controls.Presenters;
using Avalonia.Input.TextInput; using Avalonia.Input.TextInput;
using Avalonia.Media.TextFormatting; using Avalonia.Media.TextFormatting;
using Avalonia.VisualTree;
using System.Text; using System.Text;
namespace Ursa.Controls; namespace Ursa.Controls;