whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Guard QAppleKeyMapper::fromNSString() with iOS define 

It's only used from iOS.

Change-Id: I0d653cb76fc27085c74feb5d2628cb1a201ade05
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
bb10
Tor Arne Vestbø 2023-10-02 21:44:28 +02:00
parent cd4000a97d
commit e44aee9848
2 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/gui/platform/darwin/qapplekeymapper.mm
View File

@ -36,36 +36,6 @@ static Qt::KeyboardModifiers swapModifiersIfNeeded(const Qt::KeyboardModifiers m
return swappedModifiers;
}
Qt::Key QAppleKeyMapper::fromNSString(Qt::KeyboardModifiers qtModifiers, NSString *characters,
NSString *charactersIgnoringModifiers, QString &text)
{
if ([characters isEqualToString:@"\t"]) {
if (qtModifiers & Qt::ShiftModifier)
return Qt::Key_Backtab;
return Qt::Key_Tab;
} else if ([characters isEqualToString:@"\r"]) {
if (qtModifiers & Qt::KeypadModifier)
return Qt::Key_Enter;
return Qt::Key_Return;
}
if ([characters length] != 0 || [charactersIgnoringModifiers length] != 0) {
QChar ch;
if (((qtModifiers & Qt::MetaModifier) || (qtModifiers & Qt::AltModifier)) &&
([charactersIgnoringModifiers length] != 0)) {
ch = QChar([charactersIgnoringModifiers characterAtIndex:0]);
} else if ([characters length] != 0) {
ch = QChar([characters characterAtIndex:0]);
}
if (!(qtModifiers & (Qt::ControlModifier | Qt::MetaModifier)) &&
(ch.unicode() < 0xf700 || ch.unicode() > 0xf8ff)) {
text = QString::fromNSString(characters);
}
if (!ch.isNull())
return Qt::Key(ch.toUpper().unicode());
}
return Qt::Key_unknown;
}
#ifdef Q_OS_MACOS
static constexpr std::tuple<NSEventModifierFlags, Qt::KeyboardModifier> cocoaModifierMap[] = {
{ NSEventModifierFlagShift, Qt::ShiftModifier },
@ -584,6 +554,36 @@ QList<QKeyCombination> QAppleKeyMapper::possibleKeyCombinations(const QKeyEvent
#else // iOS
Qt::Key QAppleKeyMapper::fromNSString(Qt::KeyboardModifiers qtModifiers, NSString *characters,
NSString *charactersIgnoringModifiers, QString &text)
{
if ([characters isEqualToString:@"\t"]) {
if (qtModifiers & Qt::ShiftModifier)
return Qt::Key_Backtab;
return Qt::Key_Tab;
} else if ([characters isEqualToString:@"\r"]) {
if (qtModifiers & Qt::KeypadModifier)
return Qt::Key_Enter;
return Qt::Key_Return;
}
if ([characters length] != 0 || [charactersIgnoringModifiers length] != 0) {
QChar ch;
if (((qtModifiers & Qt::MetaModifier) || (qtModifiers & Qt::AltModifier)) &&
([charactersIgnoringModifiers length] != 0)) {
ch = QChar([charactersIgnoringModifiers characterAtIndex:0]);
} else if ([characters length] != 0) {
ch = QChar([characters characterAtIndex:0]);
}
if (!(qtModifiers & (Qt::ControlModifier | Qt::MetaModifier)) &&
(ch.unicode() < 0xf700 || ch.unicode() > 0xf8ff)) {
text = QString::fromNSString(characters);
}
if (!ch.isNull())
return Qt::Key(ch.toUpper().unicode());
}
return Qt::Key_unknown;
}
// Keyboard keys (non-modifiers)
API_AVAILABLE(ios(13.4)) Qt::Key QAppleKeyMapper::fromUIKitKey(NSString *keyCode)
{

5
src/gui/platform/darwin/qapplekeymapper_p.h
View File

@ -35,8 +35,6 @@ public:
Qt::KeyboardModifiers queryKeyboardModifiers() const override;
QList<QKeyCombination> possibleKeyCombinations(const QKeyEvent *event) const override;
static Qt::Key fromNSString(Qt::KeyboardModifiers qtMods, NSString *characters,
NSString *charactersIgnoringModifiers, QString &text);
#ifdef Q_OS_MACOS
static Qt::KeyboardModifiers fromCocoaModifiers(NSEventModifierFlags cocoaModifiers);
static NSEventModifierFlags toCocoaModifiers(Qt::KeyboardModifiers);
@ -44,6 +42,9 @@ public:
static QChar toCocoaKey(Qt::Key key);
static Qt::Key fromCocoaKey(QChar keyCode);
#else
static Qt::Key fromNSString(Qt::KeyboardModifiers qtMods, NSString *characters,
NSString *charactersIgnoringModifiers, QString &text);
static Qt::Key fromUIKitKey(NSString *keyCode);
static Qt::KeyboardModifiers fromUIKitModifiers(ulong uikitModifiers);
static ulong toUIKitModifiers(Qt::KeyboardModifiers);