forked from qt-creator/qt-creator
DiffEditor: Jump to original file on Enter
Task-number: QTCREATORBUG-18650 Change-Id: Id6bfb9892aee2e4d7b7772b7dd208107ec4b3b11 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
committed by
Orgad Shaneh
parent
c650b547db
commit
6334632f00
@@ -112,6 +112,7 @@ protected:
|
|||||||
QColor replacementPenColor(int blockNumber) const override;
|
QColor replacementPenColor(int blockNumber) const override;
|
||||||
QString plainTextFromSelection(const QTextCursor &cursor) const override;
|
QString plainTextFromSelection(const QTextCursor &cursor) const override;
|
||||||
void mouseDoubleClickEvent(QMouseEvent *e) override;
|
void mouseDoubleClickEvent(QMouseEvent *e) override;
|
||||||
|
void keyPressEvent(QKeyEvent *e) override;
|
||||||
void contextMenuEvent(QContextMenuEvent *e) override;
|
void contextMenuEvent(QContextMenuEvent *e) override;
|
||||||
void paintEvent(QPaintEvent *e) override;
|
void paintEvent(QPaintEvent *e) override;
|
||||||
void scrollContentsBy(int dx, int dy) override;
|
void scrollContentsBy(int dx, int dy) override;
|
||||||
@@ -393,6 +394,16 @@ void SideDiffEditorWidget::mouseDoubleClickEvent(QMouseEvent *e)
|
|||||||
SelectableTextEditorWidget::mouseDoubleClickEvent(e);
|
SelectableTextEditorWidget::mouseDoubleClickEvent(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SideDiffEditorWidget::keyPressEvent(QKeyEvent *e)
|
||||||
|
{
|
||||||
|
if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
|
||||||
|
jumpToOriginalFile(textCursor());
|
||||||
|
e->accept();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
SelectableTextEditorWidget::keyPressEvent(e);
|
||||||
|
}
|
||||||
|
|
||||||
void SideDiffEditorWidget::contextMenuEvent(QContextMenuEvent *e)
|
void SideDiffEditorWidget::contextMenuEvent(QContextMenuEvent *e)
|
||||||
{
|
{
|
||||||
QPointer<QMenu> menu = createStandardContextMenu();
|
QPointer<QMenu> menu = createStandardContextMenu();
|
||||||
|
@@ -161,6 +161,16 @@ void UnifiedDiffEditorWidget::mouseDoubleClickEvent(QMouseEvent *e)
|
|||||||
SelectableTextEditorWidget::mouseDoubleClickEvent(e);
|
SelectableTextEditorWidget::mouseDoubleClickEvent(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void UnifiedDiffEditorWidget::keyPressEvent(QKeyEvent *e)
|
||||||
|
{
|
||||||
|
if (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return) {
|
||||||
|
jumpToOriginalFile(textCursor());
|
||||||
|
e->accept();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
SelectableTextEditorWidget::keyPressEvent(e);
|
||||||
|
}
|
||||||
|
|
||||||
void UnifiedDiffEditorWidget::contextMenuEvent(QContextMenuEvent *e)
|
void UnifiedDiffEditorWidget::contextMenuEvent(QContextMenuEvent *e)
|
||||||
{
|
{
|
||||||
QPointer<QMenu> menu = createStandardContextMenu();
|
QPointer<QMenu> menu = createStandardContextMenu();
|
||||||
|
@@ -74,6 +74,7 @@ signals:
|
|||||||
|
|
||||||
protected:
|
protected:
|
||||||
void mouseDoubleClickEvent(QMouseEvent *e) override;
|
void mouseDoubleClickEvent(QMouseEvent *e) override;
|
||||||
|
void keyPressEvent(QKeyEvent *e) override;
|
||||||
void contextMenuEvent(QContextMenuEvent *e) override;
|
void contextMenuEvent(QContextMenuEvent *e) override;
|
||||||
QString lineNumber(int blockNumber) const override;
|
QString lineNumber(int blockNumber) const override;
|
||||||
int lineNumberDigits() const override;
|
int lineNumberDigits() const override;
|
||||||
|
Reference in New Issue
Block a user