Flag: Added context menu

[pulseview.git] / pv / view / ruler.cpp

diff --git a/pv/view/ruler.cpp b/pv/view/ruler.cpp
index ece80e2a94bfc38c68396e09ca8a65a73c936dea..bcf6a5281d494195b97bfc6c152dfc59227453f1 100644 (file)
--- a/pv/view/ruler.cpp
+++ b/pv/view/ruler.cpp
@@ -22,6 +22,7 @@
 
 #include <QApplication>
 #include <QFontMetrics>
+#include <QMenu>
 #include <QMouseEvent>
 
 #include "ruler.hpp"
@@ -43,8 +44,6 @@ const int Ruler::MinorTickSubdivision = 4;
 
 const float Ruler::HoverArrowSize = 0.5f;  // x Text Height
 
-const int Ruler::Padding = 20;
-
 Ruler::Ruler(View &parent) :
        MarginWidget(parent)
 {
@@ -70,9 +69,21 @@ QSize Ruler::sizeHint() const
 
 QSize Ruler::extended_size_hint() const
 {
-       const int text_height = calculate_text_height();
-       return QSize(0, RulerHeight * text_height +
-               (text_height + Padding + ViewItem::HighlightRadius) / 2);
+       QRectF max_rect;
+       std::vector< std::shared_ptr<TimeItem> > items(view_.time_items());
+       for (auto &i : items)
+               max_rect = max_rect.united(i->label_rect(QRect()));
+       return QSize(0, sizeHint().height() - max_rect.top() / 2 +
+               ViewItem::HighlightRadius);
+}
+
+shared_ptr<TimeItem> Ruler::get_mouse_over_item(const QPoint &pt)
+{
+       const vector< shared_ptr<TimeItem> > items(view_.time_items());
+       for (auto i = items.rbegin(); i != items.rend(); i++)
+               if ((*i)->enabled() && (*i)->label_rect(rect()).contains(pt))
+                       return *i;
+       return nullptr;
 }
 
 void Ruler::paintEvent(QPaintEvent*)
@@ -173,18 +184,10 @@ void Ruler::mousePressEvent(QMouseEvent *e)
 {
        if (e->buttons() & Qt::LeftButton) {
                mouse_down_point_ = e->pos();
-
-               mouse_down_item_.reset();
+               mouse_down_item_ = get_mouse_over_item(e->pos());
 
                clear_selection();
 
-               const vector< shared_ptr<TimeItem> > items(view_.time_items());
-               for (auto i = items.rbegin(); i != items.rend(); i++)
-                       if ((*i)->label_rect(rect()).contains(e->pos())) {
-                               mouse_down_item_ = (*i);
-                               break;
-                       }
-
                if (mouse_down_item_) {
                        mouse_down_item_->select();
                        mouse_down_item_->drag();
@@ -227,6 +230,17 @@ void Ruler::mouseDoubleClickEvent(QMouseEvent *e)
        view_.add_flag(view_.offset() + ((double)e->x() + 0.5) * view_.scale());
 }
 
+void Ruler::contextMenuEvent(QContextMenuEvent *event)
+{
+       const shared_ptr<TimeItem> r = get_mouse_over_item(mouse_point_);
+       if (!r)
+               return;
+
+       QMenu *menu = r->create_context_menu(this);
+       if (menu)
+               menu->exec(event->globalPos());
+}
+
 void Ruler::keyPressEvent(QKeyEvent *e)
 {
        assert(e);