diff --git a/toonz/sources/toonz/sceneviewer.h b/toonz/sources/toonz/sceneviewer.h index e87e1bb..574df1a 100644 --- a/toonz/sources/toonz/sceneviewer.h +++ b/toonz/sources/toonz/sceneviewer.h @@ -66,7 +66,8 @@ class SceneViewer final : public GLWidgetForHighDpi, Qt::MouseButton m_mouseButton; bool m_foregroundDrawing; - bool m_tabletEvent, m_tabletPressed, m_tabletReleased, m_tabletMove, m_tabletActive; + bool m_tabletEvent, m_tabletPressed, m_tabletReleased, m_tabletMove, + m_tabletActive; // used to handle wrong mouse drag events! bool m_buttonClicked, m_toolSwitched; bool m_shownOnce = false; diff --git a/toonz/sources/toonz/sceneviewerevents.cpp b/toonz/sources/toonz/sceneviewerevents.cpp index de274bf..8553db2 100644 --- a/toonz/sources/toonz/sceneviewerevents.cpp +++ b/toonz/sources/toonz/sceneviewerevents.cpp @@ -201,15 +201,15 @@ void SceneViewer::onButtonPressed(FlipConsole::EGadget button) { void SceneViewer::tabletEvent(QTabletEvent *e) { if (m_freezedStatus != NO_FREEZED) return; - m_tabletEvent = true; - m_pressure = e->pressure(); - m_tabletPressed = false; - m_tabletReleased = false; - m_tabletMove = false; - int type = e->type(); - if (type == 92) m_tabletPressed = true; + m_tabletEvent = true; + m_pressure = e->pressure(); + m_tabletPressed = false; + m_tabletReleased = false; + m_tabletMove = false; + int type = e->type(); + if (type == 92) m_tabletPressed = true; if (type == 93) m_tabletReleased = true; - if (type == 87) m_tabletMove = true; + if (type == 87) m_tabletMove = true; // Management of the Eraser pointer ToolHandle *toolHandle = TApp::instance()->getCurrentTool(); if (e->pointerType() == QTabletEvent::Eraser) { @@ -383,11 +383,11 @@ void SceneViewer::mouseMoveEvent(QMouseEvent *event) { // << " pressure=" << m_pressure << " mouseButton=" << m_mouseButton // << " buttonClicked=" << m_buttonClicked; - //separate tablet events from mouse events - //don't perform a drag event if tablet not active - if (m_tabletActive && !m_tabletMove) return; + // separate tablet events from mouse events + // don't perform a drag event if tablet not active + if (m_tabletActive && !m_tabletMove) return; if (m_tabletEvent && m_tabletActive && m_tabletMove) { - tool->leftButtonDrag(pos, toonzEvent); + tool->leftButtonDrag(pos, toonzEvent); } else if (m_mouseButton == Qt::LeftButton) { @@ -400,7 +400,7 @@ void SceneViewer::mouseMoveEvent(QMouseEvent *event) { // m_tabletEvent=false; } if (!cursorSet) setToolCursor(this, tool->getCursorId()); - m_pos = curPos; + m_pos = curPos; m_tabletMove = false; } else if (m_mouseButton == Qt::MidButton) { if ((event->buttons() & Qt::MidButton) == 0) @@ -502,10 +502,9 @@ void SceneViewer::mousePressEvent(QMouseEvent *event) { } // separate tablet and mouse events if (m_tabletEvent && m_tabletPressed) { - m_tabletActive = true; - tool->leftButtonDown(pos, toonzEvent); - } - else if (m_mouseButton == Qt::LeftButton) { + m_tabletActive = true; + tool->leftButtonDown(pos, toonzEvent); + } else if (m_mouseButton == Qt::LeftButton) { TApp::instance()->getCurrentTool()->setToolBusy(true); tool->leftButtonDown(pos, toonzEvent); } @@ -531,7 +530,7 @@ void SceneViewer::mouseReleaseEvent(QMouseEvent *event) { if (m_mouseButton != event->button()) return; - //reject if tablet was active and the up button is not actually the pen. + // reject if tablet was active and the up button is not actually the pen. if (m_tabletActive && !m_tabletReleased) return; if (m_current3DDevice != NONE) { m_mouseButton = Qt::NoButton; @@ -582,13 +581,13 @@ void SceneViewer::mouseReleaseEvent(QMouseEvent *event) { quit: - m_mouseButton = Qt::NoButton; - m_tabletEvent = false; - m_tabletPressed = false; - m_tabletActive = false; + m_mouseButton = Qt::NoButton; + m_tabletEvent = false; + m_tabletPressed = false; + m_tabletActive = false; m_tabletReleased = false; - m_tabletMove = false; - m_pressure = 0; + m_tabletMove = false; + m_pressure = 0; } //----------------------------------------------------------------------------- @@ -690,43 +689,43 @@ bool SceneViewer::event(QEvent *e) { clock.start(); } -/* -switch(e->type()) -{ -case QEvent::Enter: -qDebug() << "************************** Enter"; -break; -case QEvent::Leave: -qDebug() << "************************** Leave"; -break; - -case QEvent::TabletPress: -qDebug() << "************************** TabletPress" << m_pressure; -break; -case QEvent::TabletMove: -qDebug() << "************************** TabletMove"; -break; -case QEvent::TabletRelease: -qDebug() << "************************** TabletRelease"; -break; - - -case QEvent::MouseButtonPress: -qDebug() << "**************************MouseButtonPress" << m_pressure << " " -<< m_tabletEvent; -break; -case QEvent::MouseMove: -qDebug() << "**************************MouseMove" << m_pressure; -break; -case QEvent::MouseButtonRelease: -qDebug() << "**************************MouseButtonRelease"; -break; - -case QEvent::MouseButtonDblClick: -qDebug() << "============================== MouseButtonDblClick"; -break; -} -*/ + /* + switch(e->type()) + { + case QEvent::Enter: + qDebug() << "************************** Enter"; + break; + case QEvent::Leave: + qDebug() << "************************** Leave"; + break; + + case QEvent::TabletPress: + qDebug() << "************************** TabletPress" << m_pressure; + break; + case QEvent::TabletMove: + qDebug() << "************************** TabletMove"; + break; + case QEvent::TabletRelease: + qDebug() << "************************** TabletRelease"; + break; + + + case QEvent::MouseButtonPress: + qDebug() << "**************************MouseButtonPress" << m_pressure << " " + << m_tabletEvent; + break; + case QEvent::MouseMove: + qDebug() << "**************************MouseMove" << m_pressure; + break; + case QEvent::MouseButtonRelease: + qDebug() << "**************************MouseButtonRelease"; + break; + + case QEvent::MouseButtonDblClick: + qDebug() << "============================== MouseButtonDblClick"; + break; + } + */ return QGLWidget::event(e); }