feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Consider Qt::Key_Backspace and Qt::Key_Delete as delete keys

Browse Source 
Both keys where set as a global shortcut for deletion.
The timeline considered only one of them.

Change-Id: I5d27221a371535e94751ffcd0f6d4420978d0f81
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Knud Dollereder
2021-10-06 13:54:19 +02:00
parent f3276a96e9
commit ee6f3a8cc8
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/qmldesigner/components/timelineeditor/timelinegraphicsscene.cpp
View File

@@ -70,12 +70,9 @@
namespace QmlDesigner { namespace QmlDesigner {
static int deleteKey() static bool isDeleteKey(int key)
{ {
if (Utils::HostOsInfo::isMacHost()) return (key == Qt::Key_Backspace) | (key == Qt::Key_Delete);
return Qt::Key_Backspace;
return Qt::Key_Delete;
} }
QList<QmlTimelineKeyframeGroup> allTimelineFrames(const QmlTimeline &timeline) QList<QmlTimelineKeyframeGroup> allTimelineFrames(const QmlTimeline &timeline)
@@ -674,7 +671,7 @@ void TimelineGraphicsScene::keyReleaseEvent(QKeyEvent *keyEvent)
return; return;
} }
if (deleteKey() == keyEvent->key()) if (isDeleteKey(keyEvent->key()))
handleKeyframeDeletion(); handleKeyframeDeletion();
QGraphicsScene::keyReleaseEvent(keyEvent); QGraphicsScene::keyReleaseEvent(keyEvent);
@@ -838,7 +835,7 @@ bool TimelineGraphicsScene::event(QEvent *event)
{ {
switch (event->type()) { switch (event->type()) {
case QEvent::ShortcutOverride: case QEvent::ShortcutOverride:
if (static_cast<QKeyEvent *>(event)->key() == deleteKey()) { if (isDeleteKey(static_cast<QKeyEvent *>(event)->key())) {
QGraphicsScene::keyPressEvent(static_cast<QKeyEvent *>(event)); QGraphicsScene::keyPressEvent(static_cast<QKeyEvent *>(event));
event->accept(); event->accept();
return true; return true;