diff --git a/app/widget/menu/menushared.cpp b/app/widget/menu/menushared.cpp index e202f1aec..cdb3b3527 100644 --- a/app/widget/menu/menushared.cpp +++ b/app/widget/menu/menushared.cpp @@ -162,7 +162,7 @@ void MenuShared::AddItemsForClipEditMenu(Menu *m) void MenuShared::AddItemsForTimeRulerMenu(Menu *m, const rational& timebase) { - // If menu is already created (such as the view menu) we need to remove the instance + // If a menu is already created (such as the view menu) we need to remove the instance // of dropfram or non-dropframe timecode that is already there to avoid double displays if (m->actions().contains(view_timecode_view_dropframe_item_)) { diff --git a/app/widget/slider/rationalslider.cpp b/app/widget/slider/rationalslider.cpp index 43ce05ba0..fbe6f9ba4 100644 --- a/app/widget/slider/rationalslider.cpp +++ b/app/widget/slider/rationalslider.cpp @@ -17,6 +17,8 @@ #include "common/timecodefunctions.h" #include "core.h" +#include "widget/menu/menu.h" +#include "widget/menu/menushared.h" namespace olive { @@ -189,7 +191,12 @@ void RationalSlider::changeDisplayType() { if (!LockDisplayType()) { // Loop through the display types - SetDisplayType(static_cast(((int)(display_type_) + 1) % 4)); + //SetDisplayType(static_cast(((int)(display_type_) + 1) % 4)); + Menu m(this); + MenuShared::instance()->AddItemsForTimeRulerMenu(&m, timebase_); + MenuShared::instance()->AboutToShowTimeRulerActions(); + + m.exec(QCursor::pos()); ForceLabelUpdate(); } } diff --git a/app/widget/slider/sliderlabel.cpp b/app/widget/slider/sliderlabel.cpp index 2d4de040b..276a2bc75 100644 --- a/app/widget/slider/sliderlabel.cpp +++ b/app/widget/slider/sliderlabel.cpp @@ -54,11 +54,11 @@ void SliderLabel::mousePressEvent(QMouseEvent *e) if (e->button() == Qt::LeftButton) { if (e->modifiers() & Qt::AltModifier) { emit RequestReset(); - } else if (e->modifiers() & Qt::ControlModifier) { - emit ChangeSliderType(); } else { emit LabelPressed(); } + } else if (e->button() == Qt::RightButton) { + emit ChangeSliderType(); } }