mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-09 18:31:04 +00:00
ShortcutWidget: override shortcuts in the way they are meant to be (#10075)
I would say "by the books" but the documentation was not really clear. Problems with the logic of the previous implementation were exposed in Qt 5.6 by commit <https://codereview.qt-project.org/125142>. <http://mid.gmane.org/20160510070413.wzjpk4w4turnx6pr@cotopaxi> Note that ShortcutOverride events are used elsewhere in the code where they may need to be corrected in the same way.
This commit is contained in:
parent
0f3dbc472f
commit
a645d7f4e5
@ -45,7 +45,6 @@ namespace frontend {
|
|||||||
ShortcutWidget::ShortcutWidget(QWidget * parent)
|
ShortcutWidget::ShortcutWidget(QWidget * parent)
|
||||||
: QLabel(parent), keysequence_()
|
: QLabel(parent), keysequence_()
|
||||||
{
|
{
|
||||||
QApplication::instance()->installEventFilter(this);
|
|
||||||
has_cursor_ = false;
|
has_cursor_ = false;
|
||||||
setFrameShape(QFrame::Panel);
|
setFrameShape(QFrame::Panel);
|
||||||
setFrameShadow(QFrame::Raised);
|
setFrameShadow(QFrame::Raised);
|
||||||
@ -62,24 +61,6 @@ void ShortcutWidget::reset()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
bool ShortcutWidget::eventFilter(QObject * obj, QEvent * e)
|
|
||||||
{
|
|
||||||
if (!has_cursor_)
|
|
||||||
return false;
|
|
||||||
|
|
||||||
switch (e->type()) {
|
|
||||||
// swallow these if we have focus and they come from elsewhere
|
|
||||||
case QEvent::Shortcut:
|
|
||||||
case QEvent::ShortcutOverride:
|
|
||||||
if (obj != this)
|
|
||||||
return true;
|
|
||||||
default:
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
KeySequence const ShortcutWidget::getKeySequence() const
|
KeySequence const ShortcutWidget::getKeySequence() const
|
||||||
{
|
{
|
||||||
return keysequence_;
|
return keysequence_;
|
||||||
@ -124,11 +105,15 @@ bool ShortcutWidget::event(QEvent * e)
|
|||||||
setFrameShadow(QFrame::Sunken);
|
setFrameShadow(QFrame::Sunken);
|
||||||
break;
|
break;
|
||||||
case QEvent::ShortcutOverride:
|
case QEvent::ShortcutOverride:
|
||||||
|
// accepting the ShortcutOverride event lets us override shortcuts
|
||||||
|
// and capture them as keypress events instead
|
||||||
|
e->accept();
|
||||||
|
return true;
|
||||||
|
case QEvent::KeyPress:
|
||||||
keyPressEvent(static_cast<QKeyEvent *>(e));
|
keyPressEvent(static_cast<QKeyEvent *>(e));
|
||||||
return true;
|
return true;
|
||||||
case QEvent::KeyRelease:
|
case QEvent::KeyRelease:
|
||||||
case QEvent::Shortcut:
|
case QEvent::Shortcut:
|
||||||
case QEvent::KeyPress:
|
|
||||||
return true;
|
return true;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
@ -31,7 +31,6 @@ class ShortcutWidget : public QLabel {
|
|||||||
public:
|
public:
|
||||||
ShortcutWidget(QWidget * parent);
|
ShortcutWidget(QWidget * parent);
|
||||||
void reset();
|
void reset();
|
||||||
bool eventFilter(QObject*, QEvent* e );
|
|
||||||
KeySequence const getKeySequence() const;
|
KeySequence const getKeySequence() const;
|
||||||
void setKeySequence(lyx::KeySequence const & s);
|
void setKeySequence(lyx::KeySequence const & s);
|
||||||
void removeFromSequence();
|
void removeFromSequence();
|
||||||
|
Loading…
Reference in New Issue
Block a user