Adds further migration results and moves generated tests in
This commit is contained in:
442 files changed
+17126
-246
No files matched your search
@@ -25,12 +25,12 @@ const int TimelineView::s_textHeight = 20;
|
||||
|
||||
TimelineView::TimelineView(QWidget *parent)
|
||||
: QTreeView(parent)
|
||||
, m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger().getNGLLogger("Timeline.TimelineView"))
|
||||
, m_header(new TimelineHeaderView(this))
|
||||
, m_dragHandler(new TimelineViewDragHandler(this))
|
||||
, m_resizeHandler(new TimelineViewResizeHandler(this))
|
||||
, m_selectHandler(new TimelineViewSelectHandler(this))
|
||||
, m_trackHandler(new TimelineViewTrackHandler(this))
|
||||
.getNGLLogger("Timeline.TimelineView"))
|
||||
{
|
||||
setAlternatingRowColors(true);
|
||||
setEditTriggers(QAbstractItemView::NoEditTriggers);
|
||||
@@ -378,13 +378,13 @@ void TimelineView::mouseDoubleClickEvent(QMouseEvent* event)
|
||||
|
||||
void TimelineView::mouseMoveEvent(QMouseEvent* event)
|
||||
{
|
||||
m_cursorPosition = event->pos();
|
||||
m_cursorPosition = event->position().toPoint();
|
||||
|
||||
const QModelIndex index(indexAt(event->pos()));
|
||||
const QModelIndex index(indexAt(event->position().toPoint()));
|
||||
|
||||
if (m_header)
|
||||
{
|
||||
m_header->setHoverPosition(isCursorWithinRange(event->pos()) ? event->pos().x() : -1);
|
||||
m_header->setHoverPosition(isCursorWithinRange(event->position().toPoint()) ? event->position().toPoint().x() : -1);
|
||||
if (m_header->mouseHandler()->isBusy())
|
||||
{
|
||||
m_header->mouseHandler()->mouseMoveEvent(event);
|
||||
@@ -440,10 +440,10 @@ void TimelineView::mouseMoveEvent(QMouseEvent* event)
|
||||
try
|
||||
{
|
||||
Track& track = m_timelineModel->track(index.data().toInt());
|
||||
Item& item = track.itemAt(toTime(event->pos().x()));
|
||||
Item& item = track.itemAt(toTime(event->position().toPoint().x()));
|
||||
int startPos = toPixel(item.startTime());
|
||||
int endPos = toPixel(item.startTime() + item.duration());
|
||||
if (endPos - startPos < 15 || (startPos + 5 < event->pos().x() && event->pos().x() < endPos - 5))
|
||||
if (endPos - startPos < 15 || (startPos + 5 < event->position().toPoint().x() && event->position().toPoint().x() < endPos - 5))
|
||||
setCursor(QCursor(Qt::ArrowCursor));
|
||||
else
|
||||
setCursor(QCursor(Qt::SizeHorCursor));
|
||||
@@ -466,7 +466,7 @@ void TimelineView::mousePressEvent(QMouseEvent* event)
|
||||
return;
|
||||
}
|
||||
|
||||
const QModelIndex index = indexAt(event->pos());
|
||||
const QModelIndex index = indexAt(event->position().toPoint());
|
||||
if (index.column() == Section::eActuator)
|
||||
{
|
||||
QTreeView::mousePressEvent(event);
|
||||
@@ -493,7 +493,7 @@ void TimelineView::mousePressEvent(QMouseEvent* event)
|
||||
}
|
||||
|
||||
if (event->button() == Qt::RightButton)
|
||||
emit customContextMenuRequested(event->pos());
|
||||
emit customContextMenuRequested(event->position().toPoint());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -556,7 +556,7 @@ void TimelineView::keyPressEvent(QKeyEvent* event)
|
||||
|
||||
void TimelineView::wheelEvent(QWheelEvent* event)
|
||||
{
|
||||
if (event->pos().y() <= m_header->geometry().bottom())
|
||||
if (event->position().toPoint().y() <= m_header->geometry().bottom())
|
||||
m_header->wheelEvent(event);
|
||||
else if (QGuiApplication::queryKeyboardModifiers() == Qt::ControlModifier)
|
||||
{
|
||||
|
||||
Reference in new issue
Block a user