diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-03-15 16:52:53 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2018-03-17 14:41:48 +0000 |
| commit | 83a1203c3ba05d2425b55ea5d5330567f14e9a08 (patch) | |
| tree | 330ab76f88f0299345bf303e382b3a17c5933a6f /src/plugins/platforms/cocoa/qnsview.mm | |
| parent | be015ef27d0233e6f0e7ea25a88462f4fdb31764 (diff) | |
macOS: Group stray input context function with other input context functions
Change-Id: I9be3c170c20aca8a7d3c8bb81b7b019cd555b3f1
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 6165771d5c..2030bad4d3 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -124,6 +124,7 @@ Q_LOGGING_CATEGORY(lcQpaTablet, "qt.qpa.input.tablet") // Private interface @interface QT_MANGLE_NAMESPACE(QNSView) () - (BOOL)isTransparentForUserInput; +- (void)textInputContextKeyboardSelectionDidChangeNotification:(NSNotification *)textInputContextKeyboardSelectionDidChangeNotification; @end @implementation QT_MANGLE_NAMESPACE(QNSView) { @@ -297,15 +298,6 @@ Q_LOGGING_CATEGORY(lcQpaTablet, "qt.qpa.input.tablet") return focusWindow; } -- (void)textInputContextKeyboardSelectionDidChangeNotification : (NSNotification *) textInputContextKeyboardSelectionDidChangeNotification -{ - Q_UNUSED(textInputContextKeyboardSelectionDidChangeNotification) - if (([NSApp keyWindow] == [self window]) && [[self window] firstResponder] == self) { - QCocoaInputContext *ic = qobject_cast<QCocoaInputContext *>(QCocoaIntegration::instance()->inputContext()); - ic->updateLocale(); - } -} - - (void)viewDidHide { if (!m_platformWindow->isExposed()) @@ -1842,6 +1834,15 @@ static QTabletEvent::TabletDevice wacomTabletDevice(NSEvent *theEvent) return @[NSUnderlineColorAttributeName, NSUnderlineStyleAttributeName]; } +- (void)textInputContextKeyboardSelectionDidChangeNotification:(NSNotification *)textInputContextKeyboardSelectionDidChangeNotification +{ + Q_UNUSED(textInputContextKeyboardSelectionDidChangeNotification) + if (([NSApp keyWindow] == self.window) && self.window.firstResponder == self) { + QCocoaInputContext *ic = qobject_cast<QCocoaInputContext *>(QCocoaIntegration::instance()->inputContext()); + ic->updateLocale(); + } +} + -(void)registerDragTypes { QMacAutoReleasePool pool; |