Compare nativeVirtualKey with enum value
This commit is contained in:
parent
024f438ce5
commit
f4b87f2322
1 changed files with 7 additions and 3 deletions
|
|
@ -31,6 +31,10 @@
|
||||||
#include <QtWidgets/QScrollBar>
|
#include <QtWidgets/QScrollBar>
|
||||||
#include <QtWidgets/QTextEdit>
|
#include <QtWidgets/QTextEdit>
|
||||||
|
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
|
#include <WinUser.h>
|
||||||
|
#endif // Q_OS_WIN
|
||||||
|
|
||||||
namespace Ui {
|
namespace Ui {
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
|
|
@ -2910,16 +2914,16 @@ bool InputField::handleMarkdownKey(QKeyEvent *e) {
|
||||||
return sequence.matches(events) == QKeySequence::ExactMatch;
|
return sequence.matches(events) == QKeySequence::ExactMatch;
|
||||||
};
|
};
|
||||||
const auto matchesCtrlShiftDot = [&] {
|
const auto matchesCtrlShiftDot = [&] {
|
||||||
#ifdef Q_OS_WIN
|
|
||||||
// We can't match ctrl+shift+. with QKeySequence because
|
// We can't match ctrl+shift+. with QKeySequence because
|
||||||
// shift+. gives us '>' and ctrl+shift+> is not the same.
|
// shift+. gives us '>' and ctrl+shift+> is not the same.
|
||||||
// So we check by nativeVirtualKey instead.
|
// So we check by nativeVirtualKey instead.
|
||||||
|
#ifdef Q_OS_WIN
|
||||||
return e->modifiers().testFlag(Qt::ControlModifier)
|
return e->modifiers().testFlag(Qt::ControlModifier)
|
||||||
&& e->modifiers().testFlag(Qt::ShiftModifier)
|
&& e->modifiers().testFlag(Qt::ShiftModifier)
|
||||||
&& (e->nativeVirtualKey() == 190); // VK_OEM_PERIOD
|
&& (e->nativeVirtualKey() == VK_OEM_PERIOD);
|
||||||
#else // Q_OS_WIN
|
#else // Q_OS_WIN
|
||||||
return false;
|
return false;
|
||||||
#endif // Q_OS_WIN
|
#endif // !Q_OS_WIN
|
||||||
};
|
};
|
||||||
if (e == QKeySequence::Bold) {
|
if (e == QKeySequence::Bold) {
|
||||||
toggleSelectionMarkdown(kTagBold);
|
toggleSelectionMarkdown(kTagBold);
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue