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

Merge remote-tracking branch 'origin/4.4'

Browse Source 
Change-Id: Id525d68a899f2db14c2d52c200a3a2a8a4e81590
This commit is contained in:
Eike Ziller
2017-08-24 13:23:04 +02:00
parent 7b52aa2a11 1b89ccb859
commit df796e2aa5
16 changed files with 213 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/projectexplorer/compileoutputwindow.cpp
View File

@@ -110,8 +110,8 @@ private:
protected:
void mouseMoveEvent(QMouseEvent *ev)
{
int line = cursorForPosition(ev->pos()).block().blockNumber();
if (m_taskids.value(line, 0))
const int line = cursorForPosition(ev->pos()).block().blockNumber();
if (m_taskids.contains(line) && m_mousePressButton == Qt::NoButton)
viewport()->setCursor(Qt::PointingHandCursor);
else
viewport()->setCursor(Qt::IBeamCursor);
@@ -121,23 +121,27 @@ protected:
void mousePressEvent(QMouseEvent *ev)
{
m_mousePressPosition = ev->pos();
m_mousePressButton = ev->button();
QPlainTextEdit::mousePressEvent(ev);
}
void mouseReleaseEvent(QMouseEvent *ev)
{
if ((m_mousePressPosition - ev->pos()).manhattanLength() < 4) {
if ((m_mousePressPosition - ev->pos()).manhattanLength() < 4
&& m_mousePressButton == Qt::LeftButton) {
int line = cursorForPosition(ev->pos()).block().blockNumber();
if (unsigned taskid = m_taskids.value(line, 0))
TaskHub::showTaskInEditor(taskid);
}
m_mousePressButton = Qt::NoButton;
QPlainTextEdit::mouseReleaseEvent(ev);
}
private:
QHash<int, unsigned int> m_taskids; //Map blocknumber to taskId
QPoint m_mousePressPosition;
Qt::MouseButton m_mousePressButton = Qt::NoButton;
};
} // namespace Internal