Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-08 03:08:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #860 from makitsune/fix-alt-on-linux

Browse source 
Fix alt key on Linux
This commit is contained in:
daleglass 2020-12-10 23:45:55 +01:00 committed by GitHub
commit 70f2866871
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
libraries/gl/src/gl/GLWidget.cpp
View file

@ -35,11 +35,6 @@ class GLPaintEngine : public QPaintEngine {
}; };
GLWidget::GLWidget() { GLWidget::GLWidget() {
#ifdef Q_OS_LINUX
// Cause GLWidget::eventFilter to be called.
// It wouldn't hurt to do this on Mac and PC too; but apparently it's only needed on linux.
qApp->installEventFilter(this);
#endif
setAttribute(Qt::WA_AcceptTouchEvents); setAttribute(Qt::WA_AcceptTouchEvents);
setAttribute(Qt::WA_NativeWindow); setAttribute(Qt::WA_NativeWindow);
setAttribute(Qt::WA_PaintOnScreen); setAttribute(Qt::WA_PaintOnScreen);
@ -118,39 +113,6 @@ bool GLWidget::event(QEvent* event) {
return QWidget::event(event); return QWidget::event(event);
} }
// Pressing Alt (and Meta) key alone activates the menubar because its style inherits the
// SHMenuBarAltKeyNavigation from QWindowsStyle. This makes it impossible for a scripts to
// receive keyPress events for the Alt (and Meta) key in a reliable manner.
//
// This filter catches events before QMenuBar can steal the keyboard focus.
// The idea was borrowed from
// http://www.archivum.info/qt-interest@trolltech.com/2006-09/00053/Re-(Qt4)-Alt-key-focus-QMenuBar-(solved).html
bool GLWidget::eventFilter(QObject*, QEvent* event) {
switch (event->type()) {
case QEvent::KeyPress:
case QEvent::KeyRelease:
case QEvent::ShortcutOverride:
{
QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
if (keyEvent->key() == Qt::Key_Alt || keyEvent->key() == Qt::Key_Meta) {
if (event->type() == QEvent::KeyPress) {
keyPressEvent(keyEvent);
} else if (event->type() == QEvent::KeyRelease) {
keyReleaseEvent(keyEvent);
} else {
QWidget::event(event);
}
return true;
}
}
default:
break;
}
return false;
}
bool GLWidget::nativeEvent(const QByteArray &eventType, void *message, long *result) { bool GLWidget::nativeEvent(const QByteArray &eventType, void *message, long *result) {
#ifdef Q_OS_WIN32 #ifdef Q_OS_WIN32
MSG* win32message = static_cast<MSG*>(message); MSG* win32message = static_cast<MSG*>(message);

3
libraries/gl/src/gl/GLWidget.h
View file

@ -42,9 +42,6 @@ protected:
virtual bool event(QEvent* event) override; virtual bool event(QEvent* event) override;
gl::Context* _context { nullptr }; gl::Context* _context { nullptr };
private slots:
virtual bool eventFilter(QObject*, QEvent* event) override;
private: private:
QPaintEngine* _paintEngine { nullptr }; QPaintEngine* _paintEngine { nullptr };
bool _vsyncSupported { false }; bool _vsyncSupported { false };