From 993d8025dc5bec6430e13a2ef838dc5a398e6d79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 19 Aug 2021 16:57:54 +0200 Subject: 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 --- src/plugins/platforms/cocoa/qnsview_complextext.mm | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'src/plugins/platforms/cocoa/qnsview_complextext.mm') 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 *)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 -- cgit v1.2.3