diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-08-19 16:57:54 +0200 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2021-08-21 01:28:26 +0200 |
| commit | 993d8025dc5bec6430e13a2ef838dc5a398e6d79 (patch) | |
| tree | 6c72dc00bae324e49ece0eeaf7a7348a52a18e6b /src/plugins/platforms/cocoa/qnsview_complextext.mm | |
| parent | 70df6052d8e651d0d84e026ca113c654e89c6cc2 (diff) | |
macOS: Simplify validAttributesForMarkedText
We don't need to condition this on IM enablement. The attributes are
only used if we are actually marking text, which only happens for IM
enabled views.
Pick-to: 6.2
Change-Id: I47377cf53cf2bf44a1d9513d317f82c73f083fa3
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview_complextext.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview_complextext.mm | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview_complextext.mm b/src/plugins/platforms/cocoa/qnsview_complextext.mm index a60f42bca8..154eded15c 100644 --- a/src/plugins/platforms/cocoa/qnsview_complextext.mm +++ b/src/plugins/platforms/cocoa/qnsview_complextext.mm @@ -183,16 +183,7 @@ - (NSArray<NSString *> *)validAttributesForMarkedText { - if (!m_platformWindow) - return nil; - - if (m_platformWindow->window() != QGuiApplication::focusWindow()) - return nil; - - if (queryInputMethod(m_platformWindow->window()->focusObject())) - return @[NSUnderlineColorAttributeName, NSUnderlineStyleAttributeName]; - else - return nil; + return @[NSUnderlineColorAttributeName, NSUnderlineStyleAttributeName]; } - (BOOL)hasMarkedText |