Browse Source

fix broken apis.

pull/7781/head
Dan Walmsley 5 years ago
parent
commit
8b8253c3bf
  1. 4
      src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs
  2. 2
      src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs
  3. 2
      src/Avalonia.Input/TextInput/ITextInputMethodImpl.cs
  4. 9
      src/Avalonia.Input/TextInput/InputMethodManager.cs
  5. 2
      src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs
  6. 2
      src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs

4
src/Avalonia.FreeDesktop/DBusIme/DBusTextInputMethodBase.cs

@ -198,7 +198,7 @@ namespace Avalonia.FreeDesktop.DBusIme
UpdateActive();
}
void ITextInputMethodImpl.SetActive(ITextInputMethodClient client)
void ITextInputMethodImpl.SetClient(ITextInputMethodClient client)
{
_controlActive = client is { };
UpdateActive();
@ -272,7 +272,7 @@ namespace Avalonia.FreeDesktop.DBusIme
UpdateCursorRect();
}
public abstract void SetOptions(TextInputOptionsQueryEventArgs options);
public abstract void SetOptions(TextInputOptions options);
void ITextInputMethodImpl.Reset()
{

2
src/Avalonia.FreeDesktop/DBusIme/Fcitx/FcitxX11TextInputMethod.cs

@ -93,7 +93,7 @@ namespace Avalonia.FreeDesktop.DBusIme.Fcitx
(uint)args.Timestamp).ConfigureAwait(false);
}
public override void SetOptions(TextInputOptionsQueryEventArgs options) =>
public override void SetOptions(TextInputOptions options) =>
Enqueue(async () =>
{
if(_context == null)

2
src/Avalonia.Input/TextInput/ITextInputMethodImpl.cs

@ -2,7 +2,7 @@ namespace Avalonia.Input.TextInput
{
public interface ITextInputMethodImpl
{
void SetActive(ITextInputMethodClient? client);
void SetClient(ITextInputMethodClient? client);
void SetCursorRect(Rect rect);
void SetOptions(TextInputOptions options);
void Reset();

9
src/Avalonia.Input/TextInput/InputMethodManager.cs

@ -46,11 +46,11 @@ namespace Avalonia.Input.TextInput
_transformTracker.SetVisual(_client?.TextViewVisual);
UpdateCursorRect();
_im?.SetActive(_client);
_im?.SetClient(_client);
}
else
{
_im?.SetActive(null);
_im?.SetClient(null);
_transformTracker.SetVisual(null);
}
}
@ -92,6 +92,11 @@ namespace Avalonia.Input.TextInput
_focusedElement = element;
var inputMethod = (element?.VisualRoot as ITextInputMethodRoot)?.InputMethod;
if (_im != inputMethod)
{
_im?.SetClient(null);
}
_im = inputMethod;

2
src/Web/Avalonia.Web.Blazor/AvaloniaView.razor.cs

@ -386,7 +386,7 @@ namespace Avalonia.Web.Blazor
{
}
public void SetOptions(TextInputOptionsQueryEventArgs options)
public void SetOptions(TextInputOptions options)
{
}

2
src/Windows/Avalonia.Win32/Input/Imm32InputMethod.cs

@ -216,7 +216,7 @@ namespace Avalonia.Win32.Input
ImmSetCompositionFont(himc, ref logFont);
}
public void SetOptions(TextInputOptionsQueryEventArgs options)
public void SetOptions(TextInputOptions options)
{
// we're skipping this. not usable on windows
}

Loading…
Cancel
Save