From 6d2392ef30229ff66a7da0f15e9424846f8ccde1 Mon Sep 17 00:00:00 2001 From: manongjohn <19245851+manongjohn@users.noreply.github.com> Date: Sun, 15 May 2022 21:46:37 -0400 Subject: [PATCH] Add tooltip for setting markers --- toonz/sources/toonz/xshrowviewer.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/toonz/sources/toonz/xshrowviewer.cpp b/toonz/sources/toonz/xshrowviewer.cpp index 2168513d..a984b03d 100644 --- a/toonz/sources/toonz/xshrowviewer.cpp +++ b/toonz/sources/toonz/xshrowviewer.cpp @@ -1225,6 +1225,9 @@ void RowArea::mouseMoveEvent(QMouseEvent *event) { o->path(PredefinedPath::END_PLAY_RANGE).translated(base1); if (!m_tooltip.isEmpty()) return; + + TXsheet *xsh = m_viewer->getXsheet(); + if (startArrow.contains(m_pos)) m_tooltip = tr("Playback Start Marker"); else if (endArrow.contains(m_pos)) @@ -1235,11 +1238,11 @@ void RowArea::mouseMoveEvent(QMouseEvent *event) { .arg((isRootBonePinned) ? " (Root)" : ""); else if (o->rect(PredefinedRect::NAVIGATION_TAG_AREA) .adjusted(0, 0, -frameAdj.x(), -frameAdj.y()) - .contains(mouseInCell)) { - TXsheet *xsh = m_viewer->getXsheet(); + .contains(mouseInCell) && + xsh->isFrameTagged(m_row)) { QString label = xsh->getNavigationTags()->getTagLabel(m_row); if (label.isEmpty()) label = "-"; - if (xsh->isFrameTagged(m_row)) m_tooltip = tr("Tag: %1").arg(label); + m_tooltip = tr("Tag: %1").arg(label); } else if (row == currentRow) { if (Preferences::instance()->isOnionSkinEnabled() && o->rect(PredefinedRect::ONION) @@ -1252,6 +1255,11 @@ void RowArea::mouseMoveEvent(QMouseEvent *event) { m_tooltip = tr("Fixed Onion Skin Toggle"); else if (m_showOnionToSet == Mos) m_tooltip = tr("Relative Onion Skin Toggle"); + else + m_tooltip = tr("%1+Click - Set Playback Start Marker\n%2+Click - Set " + "Playback End Marker") + .arg(trModKey("Ctrl")) + .arg(trModKey("Alt")); } //-----------------------------------------------------------------------------