diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-06-14 19:20:06 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-06-14 19:20:06 +0000 |
| commit | a6b4e53dca3fb63c143f4e1208bcc81950a95f61 (patch) | |
| tree | c3a39ac58af3c73ee4ea902dc88f855ad4e3a474 | |
| parent | 00d25ae89cbb07a68ba19e85204db956710a0618 (diff) | |
| parent | 5776fcd95517cf7536147686a09d9753c527f46e (diff) | |
| download | gtk+-a6b4e53dca3fb63c143f4e1208bcc81950a95f61.tar.gz | |
Merge branch 'macos-input-method' into 'master'
fix: make input method work again in gtk4
Closes #3968
See merge request GNOME/gtk!3668
| -rw-r--r-- | gdk/macos/gdkmacosglcontext.c | 1 | ||||
| -rw-r--r-- | gtk/gtkimcontextquartz.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gdk/macos/gdkmacosglcontext.c b/gdk/macos/gdkmacosglcontext.c index b785beadc0..e4ef4abcb1 100644 --- a/gdk/macos/gdkmacosglcontext.c +++ b/gdk/macos/gdkmacosglcontext.c @@ -145,6 +145,7 @@ ensure_gl_view (GdkMacosGLContext *self) [nsview setPostsFrameChangedNotifications: YES]; [nsview setNeedsDisplay:YES]; [nswindow setContentView:nsview]; + [nswindow makeFirstResponder:nsview]; [nsview release]; if (self->dummy_view != NULL) diff --git a/gtk/gtkimcontextquartz.c b/gtk/gtkimcontextquartz.c index 8b204222f2..62ca2c4e56 100644 --- a/gtk/gtkimcontextquartz.c +++ b/gtk/gtkimcontextquartz.c @@ -239,8 +239,7 @@ discard_preedit (GtkIMContext *context) /* reset any partial input for this NSView */ [(GdkMacosBaseView *)nsview unmarkText]; - NSInputManager *currentInputManager = [NSInputManager currentInputManager]; - [currentInputManager markedTextAbandoned:nsview]; + [[NSTextInputContext currentInputContext] discardMarkedText]; if (qc->preedit_str && strlen (qc->preedit_str) > 0) { |