Skip to content

Commit 8b8e75a

Browse files
small tweak of the tooltip logic
Signed-off-by: Cédrik Fuoco <[email protected]>
1 parent 220d18b commit 8b8e75a

File tree

1 file changed

+40
-6
lines changed

1 file changed

+40
-6
lines changed

src/lib/app/RvCommon/RvBottomViewToolBar.cpp

Lines changed: 40 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -654,9 +654,27 @@ namespace Rv
654654
// Disable the whole playmode button if all three options are disabled
655655
bool anyEnabled = loopEnabled || onceEnabled || pingPongEnabled;
656656
m_playModeAction->setEnabled(anyEnabled);
657-
QString tooltip = anyEnabled || m_customCannotUseTooltip.isEmpty()
658-
? QString::fromUtf8(playModeDefaultTooltip.data(), playModeDefaultTooltip.size())
659-
: m_customCannotUseTooltip;
657+
658+
QString tooltip;
659+
if (anyEnabled)
660+
{
661+
tooltip = QString::fromUtf8(playModeDefaultTooltip.data(), playModeDefaultTooltip.size());
662+
}
663+
else
664+
{
665+
if (!m_customCannotUseTooltip.isEmpty())
666+
{
667+
tooltip = m_customCannotUseTooltip;
668+
}
669+
else if (!m_customDisabledPrefix.isEmpty())
670+
{
671+
tooltip = m_customDisabledPrefix + QString::fromUtf8(playModeDefaultTooltip.data(), playModeDefaultTooltip.size());
672+
}
673+
else
674+
{
675+
tooltip = QString::fromUtf8(playModeDefaultTooltip.data(), playModeDefaultTooltip.size());
676+
}
677+
}
660678
m_playModeAction->setToolTip(tooltip);
661679
}
662680

@@ -728,10 +746,26 @@ namespace Rv
728746
bool categoryEnabled = m_session->isEventCategoryEnabled(mapping.category);
729747

730748
mapping.action->setEnabled(categoryEnabled);
731-
QString tooltip = mapping.defaultTooltip;
732-
if (!categoryEnabled && !m_customCannotUseTooltip.isEmpty())
749+
QString tooltip;
750+
if (categoryEnabled)
751+
{
752+
tooltip = mapping.defaultTooltip;
753+
}
754+
else
733755
{
734-
tooltip = m_customCannotUseTooltip;
756+
// Use custom "cannot use" tooltip for OTIO sessions, or prefix + default for Presentation mode
757+
if (!m_customCannotUseTooltip.isEmpty())
758+
{
759+
tooltip = m_customCannotUseTooltip;
760+
}
761+
else if (!m_customDisabledPrefix.isEmpty())
762+
{
763+
tooltip = m_customDisabledPrefix + mapping.defaultTooltip;
764+
}
765+
else
766+
{
767+
tooltip = mapping.defaultTooltip;
768+
}
735769
}
736770
mapping.action->setToolTip(tooltip);
737771
}

0 commit comments

Comments
 (0)