razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Enlarge keyframe and ease icons when clickable

Browse source
This commit is contained in:
manongjohn 2022-04-12 08:10:35 -04:00
parent b107f76f14
commit 54a7eda1bb
4 changed files with 167 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
toonz/sources/include/orientation.h
View file

@ -162,15 +162,18 @@ enum class PredefinedDimension {
SCALE_THRESHOLD //! scale threshold to simplify the view
};
enum class PredefinedPath {
DRAG_HANDLE_CORNER, //! triangle corner at drag sidebar
BEGIN_EASE_TRIANGLE, //! triangle marking beginning of ease range
END_EASE_TRIANGLE, //! triangle marking end of ease range
BEGIN_PLAY_RANGE, //! play range markers
DRAG_HANDLE_CORNER, //! triangle corner at drag sidebar
BEGIN_EASE_TRIANGLE, //! triangle marking beginning of ease range
BEGIN_EASE_TRIANGLE_LARGE, //! triangle marking beginning of ease range
END_EASE_TRIANGLE, //! triangle marking end of ease range
END_EASE_TRIANGLE_LARGE, //! triangle marking end of ease range
BEGIN_PLAY_RANGE, //! play range markers
END_PLAY_RANGE,
VOLUME_SLIDER_TRACK, //! slider track
VOLUME_SLIDER_HEAD, //! slider head
TIME_INDICATOR_HEAD, //! current time indicator head
FRAME_MARKER_DIAMOND,
FRAME_MARKER_DIAMOND_LARGE,
NAVIGATION_TAG
};
enum class PredefinedPoint {

107
toonz/sources/toonz/xshcellviewer.cpp
View file

@ -1885,7 +1885,8 @@ void CellArea::drawCurrentTimeIndicator(QPainter &p, const QPoint &xy,
}
void CellArea::drawFrameMarker(QPainter &p, const QPoint &xy, QColor color,
bool isKeyFrame, bool isCamera) {
bool isKeyFrame, bool isCamera,
bool keyHighlight) {
QColor outlineColor = Qt::black;
QPoint frameAdj = m_viewer->getFrameZoomAdjustment();
QRect dotRect = (isCamera)
@ -1904,7 +1905,10 @@ void CellArea::drawFrameMarker(QPainter &p, const QPoint &xy, QColor color,
PredefinedDimension::SCALE_THRESHOLD))
dotRect.adjust(0, -3, 0, -3);
m_viewer->drawPredefinedPath(p, PredefinedPath::FRAME_MARKER_DIAMOND,
PredefinedPath diamondPath =
keyHighlight ? PredefinedPath::FRAME_MARKER_DIAMOND_LARGE
: PredefinedPath::FRAME_MARKER_DIAMOND;
m_viewer->drawPredefinedPath(p, diamondPath,
dotRect.adjusted(1, 1, 1, 1).center(), color,
outlineColor);
} else {
@ -3112,12 +3116,21 @@ void CellArea::drawKeyframe(QPainter &p, const QRect toBeUpdated) {
if (o->isVerticalTimeline()) easeRect.adjust(-2, 0, -2, 0);
QPoint topLeft =
m_viewer->positionToXY(CellPosition(handleRow0, col));
m_viewer->drawPredefinedPath(p, PredefinedPath::BEGIN_EASE_TRIANGLE,
PredefinedPath easePath =
(m_keyHighlight == QPoint(handleRow0, col))
? PredefinedPath::BEGIN_EASE_TRIANGLE_LARGE
: PredefinedPath::BEGIN_EASE_TRIANGLE;
m_viewer->drawPredefinedPath(p, easePath,
easeRect.translated(topLeft).center(),
keyFrameColor, outline);
topLeft = m_viewer->positionToXY(CellPosition(handleRow1, col));
m_viewer->drawPredefinedPath(p, PredefinedPath::END_EASE_TRIANGLE,
topLeft = m_viewer->positionToXY(CellPosition(handleRow1, col));
easePath = (m_keyHighlight == QPoint(handleRow1, col))
? PredefinedPath::END_EASE_TRIANGLE_LARGE
: PredefinedPath::END_EASE_TRIANGLE;
m_viewer->drawPredefinedPath(p, easePath,
easeRect.translated(topLeft).center(),
keyFrameColor, outline);
}
@ -3153,25 +3166,29 @@ void CellArea::drawKeyframe(QPainter &p, const QRect toBeUpdated) {
m_viewer->getKeyframeSelection()->isSelected(row, col))
color = QColor(85, 157, 255);
drawFrameMarker(p, QPoint(x, y), color, true, col < 0);
drawFrameMarker(p, QPoint(x, y), color, true, (col < 0),
(m_keyHighlight == QPoint(row, col)));
} else {
QPixmap keyPM;
if (o->isVerticalTimeline())
target = QPoint(target.x() - 2, target.y() + 2);
} else if (o->isVerticalTimeline()) {
target = QPoint(target.x() - 2, target.y() + 2);
if (m_viewer->getKeyframeSelection() &&
m_viewer->getKeyframeSelection()->isSelected(row, col)) {
// keyframe selected
p.drawPixmap(target, selectedKey);
keyPM = selectedKey;
} else {
// keyframe not selected
p.drawPixmap(target, key);
keyPM = key;
}
} else if (m_viewer->getKeyframeSelection() &&
m_viewer->getKeyframeSelection()->isSelected(row, col)) {
// keyframe selected
p.drawPixmap(target, selectedKey);
} else {
// keyframe not selected
p.drawPixmap(target, key);
if (m_keyHighlight == QPoint(row, col)) {
keyPM = keyPM.scaled(keyPM.width() + 10, keyPM.height() + 10);
target.setX(target.x() - 3);
target.setY(target.y() - 3);
}
p.drawPixmap(target, keyPM);
}
}
}
@ -3519,6 +3536,8 @@ void CellArea::mousePressEvent(QMouseEvent *event) {
TStageObject *pegbar = xsh->getStageObject(m_viewer->getObjectId(col));
m_dragBeginEase = m_dragEndEase = m_dragKeyframe = false;
if (Preferences::instance()->isShowKeyframesOnXsheetCellAreaEnabled()) {
// only if key frame area is active
int k0, k1;
@ -3535,6 +3554,7 @@ void CellArea::mousePressEvent(QMouseEvent *event) {
m_viewer->setCurrentRow(
row); // If you click on the key, change the current row as well
setDragTool(XsheetGUI::DragTool::makeKeyframeMoverTool(m_viewer));
m_dragKeyframe = true;
accept = true;
} else {
int r0, r1;
@ -3545,10 +3565,12 @@ void CellArea::mousePressEvent(QMouseEvent *event) {
if (rh0 == row) { // in a keyframe handle
setDragTool(XsheetGUI::DragTool::makeKeyFrameHandleMoverTool(
m_viewer, true, r0));
m_dragBeginEase = true;
accept = true;
} else if (rh1 == row) { // in a keyframe handle
setDragTool(XsheetGUI::DragTool::makeKeyFrameHandleMoverTool(
m_viewer, false, r1));
m_dragEndEase = true;
accept = true;
}
}
@ -3632,6 +3654,34 @@ void CellArea::mousePressEvent(QMouseEvent *event) {
//-----------------------------------------------------------------------------
void CellArea::updateKeyHighlight(int row, int col) {
TXsheet *xsh = m_viewer->getXsheet();
TStageObject *pegbar = xsh->getStageObject(m_viewer->getObjectId(col));
int k0, k1;
bool isKeyframeFrame =
Preferences::instance()->isShowKeyframesOnXsheetCellAreaEnabled() &&
pegbar && pegbar->getKeyframeRange(k0, k1) && k0 <= row && row <= k1 + 1;
if (!isKeyframeFrame) return;
bool isDragging = getDragTool();
if ((!isDragging || m_dragKeyframe) && pegbar->isKeyframe(row))
m_keyHighlight = QPoint(row, col);
else {
int r0, r1;
double e0, e1;
int rh0, rh1;
if (pegbar->getKeyframeSpan(row, r0, e0, r1, e1) &&
getEaseHandles(r0, r1, e0, e1, rh0, rh1)) {
if ((!isDragging || m_dragBeginEase) && rh0 == row)
m_keyHighlight = QPoint(rh0, col);
else if ((!isDragging || m_dragEndEase) && rh1 == row)
m_keyHighlight = QPoint(rh1, col);
}
}
}
void CellArea::mouseMoveEvent(QMouseEvent *event) {
const Orientation *o = m_viewer->orientation();
QPoint frameAdj = m_viewer->getFrameZoomAdjustment();
@ -3656,19 +3706,24 @@ void CellArea::mouseMoveEvent(QMouseEvent *event) {
m_viewer->stopAutoPan();
m_pos = pos;
if (getDragTool()) {
getDragTool()->onDrag(event);
return;
}
CellPosition cellPosition = m_viewer->xyToPosition(pos);
int row = cellPosition.frame();
int col = cellPosition.layer();
if (getDragTool()) {
getDragTool()->onDrag(event);
if (m_keyHighlight != QPoint(-1, -1))
updateKeyHighlight(row, m_keyHighlight.y());
return;
}
QPoint cellTopLeft = m_viewer->positionToXY(CellPosition(row, col));
int x = m_pos.x() - cellTopLeft.x();
int y = m_pos.y() - cellTopLeft.y();
QPoint mouseInCell = m_pos - cellTopLeft;
bool updateViewer = (m_keyHighlight != QPoint(-1, -1));
m_keyHighlight = QPoint(-1, -1);
TXsheet *xsh = m_viewer->getXsheet();
// Verifico se e' una colonna sound
@ -3707,6 +3762,8 @@ void CellArea::mouseMoveEvent(QMouseEvent *event) {
m_tooltip = tr("Click and drag to set the deceleration range");
}
}
updateKeyHighlight(row, col);
updateViewer = true;
} else if (isKeyframeFrame && row == k1 + 1 &&
o->rect((col < 0) ? PredefinedRect::CAMERA_LOOP_ICON
: PredefinedRect::LOOP_ICON)
@ -3763,6 +3820,8 @@ void CellArea::mouseMoveEvent(QMouseEvent *event) {
m_tooltip = tr("");
} else
m_tooltip = tr("");
if (updateViewer) update();
}
//-----------------------------------------------------------------------------
@ -3773,6 +3832,7 @@ void CellArea::mouseReleaseEvent(QMouseEvent *event) {
m_viewer->stopAutoPan();
m_isPanning = false;
m_viewer->dragToolRelease(event);
m_dragBeginEase = m_dragEndEase = m_dragKeyframe = false;
}
//-----------------------------------------------------------------------------
@ -3805,6 +3865,8 @@ void CellArea::mouseDoubleClickEvent(QMouseEvent *event) {
TObjectHandle *oh = TApp::instance()->getCurrentObject();
oh->setObjectId(m_viewer->getObjectId(col));
m_dragBeginEase = m_dragEndEase = m_dragKeyframe = false;
if (Preferences::instance()->isShowKeyframesOnXsheetCellAreaEnabled()) {
QPoint cellTopLeft = m_viewer->positionToXY(CellPosition(row, col));
QPoint mouseInCell = event->pos() - cellTopLeft;
@ -3821,6 +3883,7 @@ void CellArea::mouseDoubleClickEvent(QMouseEvent *event) {
m_viewer->setCurrentRow(
row); // If you click on the key, change the current row as well
setDragTool(XsheetGUI::DragTool::makeKeyframeMoverTool(m_viewer));
m_dragKeyframe = true;
m_viewer->dragToolClick(event);
event->accept();
update();

8
toonz/sources/toonz/xshcellviewer.h
View file

@ -96,6 +96,9 @@ class CellArea final : public QWidget {
RenameCellField *m_renameCell;
bool m_dragBeginEase, m_dragEndEase, m_dragKeyframe;
QPoint m_keyHighlight;
void drawCells(QPainter &p, const QRect toBeUpdated);
void drawNonEmptyBackground(QPainter &p) const;
void drawFoldedColumns(QPainter &p, int layerAxis,
@ -130,7 +133,8 @@ class CellArea final : public QWidget {
bool isFolded = false);
void drawFrameMarker(QPainter &p, const QPoint &xy, QColor color,
bool isKeyFrame = false, bool isCamera = false);
bool isKeyFrame = false, bool isCamera = false,
bool keyHighlight = false);
void drawEndOfLevelMarker(QPainter &p, QRect rect, bool isNextEmpty,
bool isStopFrame = false);
void drawCellMarker(QPainter &p, int markId, QRect rect,
@ -144,6 +148,8 @@ class CellArea final : public QWidget {
DragTool *getDragTool() const;
void setDragTool(DragTool *dragTool);
void updateKeyHighlight(int row, int col);
public:
#if QT_VERSION >= 0x050500
CellArea(XsheetViewer *parent, Qt::WindowFlags flags = 0);

88
toonz/sources/toonzlib/orientation.cpp
View file

@ -8,16 +8,18 @@
#include <stdexcept>
namespace {
const int KEY_ICON_WIDTH = 11;
const int KEY_ICON_HEIGHT = 11;
const int EASE_TRIANGLE_SIZE = 4;
const int PLAY_MARKER_SIZE = 10;
const int PINNED_SIZE = 11;
const int NAV_TAG_WIDTH = 7;
const int NAV_TAG_HEIGHT = 13;
const int FRAME_MARKER_SIZE = 4;
const int FOLDED_CELL_SIZE = 9;
const int SHIFTTRACE_DOT_SIZE = 12;
const int KEY_ICON_WIDTH = 11;
const int KEY_ICON_HEIGHT = 11;
const int EASE_TRIANGLE_SIZE = 5;
const int EASE_TRIANGLE_SIZE_LARGE = EASE_TRIANGLE_SIZE + 2;
const int PLAY_MARKER_SIZE = 10;
const int PINNED_SIZE = 11;
const int NAV_TAG_WIDTH = 7;
const int NAV_TAG_HEIGHT = 13;
const int FRAME_MARKER_SIZE = 4;
const int FRAME_MARKER_SIZE_LARGE = FRAME_MARKER_SIZE + 2;
const int FOLDED_CELL_SIZE = 9;
const int SHIFTTRACE_DOT_SIZE = 12;
QRect iconRect(const QRect &areaRect, const int iconWidth, const int iconHeight,
const int xOffset = 0) {
@ -941,25 +943,48 @@ TopToBottomOrientation::TopToBottomOrientation() {
corner.lineTo(QPointF(0, CELL_HEIGHT));
addPath(PredefinedPath::DRAG_HANDLE_CORNER, corner);
QPainterPath diamond(QPointF(0, -4));
diamond.lineTo(4, 0);
diamond.lineTo(0, 4);
diamond.lineTo(-4, 0);
diamond.lineTo(0, -4);
QPainterPath diamond(QPointF(0, -FRAME_MARKER_SIZE));
diamond.lineTo(FRAME_MARKER_SIZE, 0);
diamond.lineTo(0, FRAME_MARKER_SIZE);
diamond.lineTo(-FRAME_MARKER_SIZE, 0);
diamond.lineTo(0, -FRAME_MARKER_SIZE);
addPath(PredefinedPath::FRAME_MARKER_DIAMOND, diamond);
QPainterPath diamondLarge(QPointF(0, -FRAME_MARKER_SIZE_LARGE));
diamondLarge.lineTo(FRAME_MARKER_SIZE_LARGE, 0);
diamondLarge.lineTo(0, FRAME_MARKER_SIZE_LARGE);
diamondLarge.lineTo(-FRAME_MARKER_SIZE_LARGE, 0);
diamondLarge.lineTo(0, -FRAME_MARKER_SIZE_LARGE);
addPath(PredefinedPath::FRAME_MARKER_DIAMOND_LARGE, diamondLarge);
QPainterPath fromTriangle(QPointF(0, EASE_TRIANGLE_SIZE / 2));
fromTriangle.lineTo(QPointF(EASE_TRIANGLE_SIZE, -EASE_TRIANGLE_SIZE / 2));
fromTriangle.lineTo(QPointF(-EASE_TRIANGLE_SIZE, -EASE_TRIANGLE_SIZE / 2));
fromTriangle.lineTo(QPointF(0, EASE_TRIANGLE_SIZE / 2));
addPath(PredefinedPath::BEGIN_EASE_TRIANGLE, fromTriangle);
QPainterPath fromTriangleLarge(QPointF(0, EASE_TRIANGLE_SIZE_LARGE / 2));
fromTriangleLarge.lineTo(
QPointF(EASE_TRIANGLE_SIZE_LARGE, -EASE_TRIANGLE_SIZE_LARGE / 2));
fromTriangleLarge.lineTo(
QPointF(-EASE_TRIANGLE_SIZE_LARGE, -EASE_TRIANGLE_SIZE_LARGE / 2));
fromTriangleLarge.lineTo(QPointF(0, EASE_TRIANGLE_SIZE_LARGE / 2));
addPath(PredefinedPath::BEGIN_EASE_TRIANGLE_LARGE, fromTriangleLarge);
QPainterPath toTriangle(QPointF(0, -EASE_TRIANGLE_SIZE / 2));
toTriangle.lineTo(QPointF(EASE_TRIANGLE_SIZE, EASE_TRIANGLE_SIZE / 2));
toTriangle.lineTo(QPointF(-EASE_TRIANGLE_SIZE, EASE_TRIANGLE_SIZE / 2));
toTriangle.lineTo(QPointF(0, -EASE_TRIANGLE_SIZE / 2));
addPath(PredefinedPath::END_EASE_TRIANGLE, toTriangle);
QPainterPath toTriangleLarge(QPointF(0, -EASE_TRIANGLE_SIZE_LARGE / 2));
toTriangleLarge.lineTo(
QPointF(EASE_TRIANGLE_SIZE_LARGE, EASE_TRIANGLE_SIZE_LARGE / 2));
toTriangleLarge.lineTo(
QPointF(-EASE_TRIANGLE_SIZE_LARGE, EASE_TRIANGLE_SIZE_LARGE / 2));
toTriangleLarge.lineTo(QPointF(0, -EASE_TRIANGLE_SIZE_LARGE / 2));
addPath(PredefinedPath::END_EASE_TRIANGLE_LARGE, toTriangleLarge);
QPainterPath playFrom(QPointF(0, 0));
playFrom.lineTo(QPointF(PLAY_MARKER_SIZE, 0));
playFrom.lineTo(QPointF(0, PLAY_MARKER_SIZE));
@ -1382,25 +1407,48 @@ LeftToRightOrientation::LeftToRightOrientation() {
corner.lineTo(QPointF(CELL_WIDTH, 0));
addPath(PredefinedPath::DRAG_HANDLE_CORNER, corner);
QPainterPath diamond(QPointF(0, -4));
diamond.lineTo(4, 0);
diamond.lineTo(0, 4);
diamond.lineTo(-4, 0);
diamond.lineTo(0, -4);
QPainterPath diamond(QPointF(0, -FRAME_MARKER_SIZE));
diamond.lineTo(FRAME_MARKER_SIZE, 0);
diamond.lineTo(0, FRAME_MARKER_SIZE);
diamond.lineTo(-FRAME_MARKER_SIZE, 0);
diamond.lineTo(0, -FRAME_MARKER_SIZE);
addPath(PredefinedPath::FRAME_MARKER_DIAMOND, diamond);
QPainterPath diamondLarge(QPointF(0, -FRAME_MARKER_SIZE_LARGE));
diamondLarge.lineTo(FRAME_MARKER_SIZE_LARGE, 0);
diamondLarge.lineTo(0, FRAME_MARKER_SIZE_LARGE);
diamondLarge.lineTo(-FRAME_MARKER_SIZE_LARGE, 0);
diamondLarge.lineTo(0, -FRAME_MARKER_SIZE_LARGE);
addPath(PredefinedPath::FRAME_MARKER_DIAMOND_LARGE, diamondLarge);
QPainterPath fromTriangle(QPointF(EASE_TRIANGLE_SIZE / 2, 0));
fromTriangle.lineTo(QPointF(-EASE_TRIANGLE_SIZE / 2, EASE_TRIANGLE_SIZE));
fromTriangle.lineTo(QPointF(-EASE_TRIANGLE_SIZE / 2, -EASE_TRIANGLE_SIZE));
fromTriangle.lineTo(QPointF(EASE_TRIANGLE_SIZE / 2, 0));
addPath(PredefinedPath::BEGIN_EASE_TRIANGLE, fromTriangle);
QPainterPath fromTriangleLarge(QPointF(EASE_TRIANGLE_SIZE_LARGE / 2, 0));
fromTriangleLarge.lineTo(
QPointF(-EASE_TRIANGLE_SIZE_LARGE / 2, EASE_TRIANGLE_SIZE_LARGE));
fromTriangleLarge.lineTo(
QPointF(-EASE_TRIANGLE_SIZE_LARGE / 2, -EASE_TRIANGLE_SIZE_LARGE));
fromTriangleLarge.lineTo(QPointF(EASE_TRIANGLE_SIZE_LARGE / 2, 0));
addPath(PredefinedPath::BEGIN_EASE_TRIANGLE_LARGE, fromTriangleLarge);
QPainterPath toTriangle(QPointF(-EASE_TRIANGLE_SIZE / 2, 0));
toTriangle.lineTo(QPointF(EASE_TRIANGLE_SIZE / 2, EASE_TRIANGLE_SIZE));
toTriangle.lineTo(QPointF(EASE_TRIANGLE_SIZE / 2, -EASE_TRIANGLE_SIZE));
toTriangle.lineTo(QPointF(-EASE_TRIANGLE_SIZE / 2, 0));
addPath(PredefinedPath::END_EASE_TRIANGLE, toTriangle);
QPainterPath toTriangleLarge(QPointF(-EASE_TRIANGLE_SIZE_LARGE / 2, 0));
toTriangleLarge.lineTo(
QPointF(EASE_TRIANGLE_SIZE_LARGE / 2, EASE_TRIANGLE_SIZE_LARGE));
toTriangleLarge.lineTo(
QPointF(EASE_TRIANGLE_SIZE_LARGE / 2, -EASE_TRIANGLE_SIZE_LARGE));
toTriangleLarge.lineTo(QPointF(-EASE_TRIANGLE_SIZE_LARGE / 2, 0));
addPath(PredefinedPath::END_EASE_TRIANGLE_LARGE, toTriangleLarge);
QPainterPath playFrom(QPointF(0, 0));
playFrom.lineTo(QPointF(PLAY_MARKER_SIZE, 0));
playFrom.lineTo(QPointF(0, PLAY_MARKER_SIZE));