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

QmlConsoleView: Use Utils::TreeView to get consistent keyboard handling

Browse Source 
Change-Id: I3b420d19602ab5e5bd9a4afd8aba7cffeca4089f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Daniel Teske
2014-04-09 18:22:54 +02:00
parent 28f8bf2f5b
commit 919510e599
2 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/qmljstools/qmlconsoleview.cpp
View File

@@ -79,7 +79,7 @@ public:
///////////////////////////////////////////////////////////////////////
QmlConsoleView::QmlConsoleView(QWidget *parent) :
QTreeView(parent)
Utils::TreeView(parent)
{
setFrameStyle(QFrame::NoFrame);
setHeaderHidden(true);
@@ -160,28 +160,18 @@ void QmlConsoleView::mousePressEvent(QMouseEvent *event)
}
}
if (!handled)
QTreeView::mousePressEvent(event);
Utils::TreeView::mousePressEvent(event);
} else {
selectionModel()->setCurrentIndex(model()->index(model()->rowCount() - 1, 0),
QItemSelectionModel::ClearAndSelect);
}
}
void QmlConsoleView::keyPressEvent(QKeyEvent *e)
{
if (!e->modifiers() && e->key() == Qt::Key_Return) {
emit activated(currentIndex());
e->accept();
return;
}
QTreeView::keyPressEvent(e);
}
void QmlConsoleView::resizeEvent(QResizeEvent *e)
{
static_cast<QmlConsoleItemDelegate *>(itemDelegate())->emitSizeHintChanged(
selectionModel()->currentIndex());
QTreeView::resizeEvent(e);
Utils::TreeView::resizeEvent(e);
}
void QmlConsoleView::drawBranches(QPainter *painter, const QRect &rect,
@@ -189,7 +179,7 @@ void QmlConsoleView::drawBranches(QPainter *painter, const QRect &rect,
{
static_cast<QmlConsoleItemDelegate *>(itemDelegate())->drawBackground(painter, rect, index,
false);
QTreeView::drawBranches(painter, rect, index);
Utils::TreeView::drawBranches(painter, rect, index);
}
void QmlConsoleView::contextMenuEvent(QContextMenuEvent *event)

5
src/plugins/qmljstools/qmlconsoleview.h
View File

@@ -30,12 +30,12 @@
#ifndef QMLCONSOLEVIEW_H
#define QMLCONSOLEVIEW_H
#include <QTreeView>
#include <utils/itemviews.h>
namespace QmlJSTools {
namespace Internal {
class QmlConsoleView : public QTreeView
class QmlConsoleView : public Utils::TreeView
{
Q_OBJECT
public:
@@ -46,7 +46,6 @@ public slots:
protected:
void mousePressEvent(QMouseEvent *event);
void keyPressEvent(QKeyEvent *e);
void resizeEvent(QResizeEvent *e);
void drawBranches(QPainter *painter, const QRect &rect,
const QModelIndex &index) const;