Added pv::view::MarginWidget as a common base class of Header and Ruler

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 63679012a52947d92b7d1fc67f40948a042f339b..8fb5b4bd3c126a104b2f37d133ceb65405ddb380 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -43,8 +43,7 @@ namespace pv {
 namespace view {
 
 Header::Header(View &parent) :
-       QWidget(&parent),
-       _view(parent),
+       MarginWidget(parent),
        _action_set_name(new QAction(tr("Set &Name..."), this)),
        _action_set_colour(new QAction(tr("Set &Colour..."), this))
 {
@@ -71,18 +70,15 @@ boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
        {
                assert(s);
 
-               const QRect signal_heading_rect(
-                       0, s->get_v_offset() - v_offset,
-                       w, View::SignalHeight);
-
-               if (s->pt_in_label_rect(signal_heading_rect, pt))
+               if (s->pt_in_label_rect(s->get_v_offset() - v_offset,
+                       0, w, pt))
                        return s;
        }
 
        return shared_ptr<Signal>();
 }
 
-void Header::paintEvent(QPaintEvent *event)
+void Header::paintEvent(QPaintEvent*)
 {
        const int w = width();
        const vector< shared_ptr<Signal> > sigs(
@@ -97,13 +93,10 @@ void Header::paintEvent(QPaintEvent *event)
        {
                assert(s);
 
-               const QRect signal_heading_rect(
-                       0, s->get_v_offset() - v_offset,
-                       w, View::SignalHeight);
-
+               const int y = s->get_v_offset() - v_offset;
                const bool highlight = !dragging && s->pt_in_label_rect(
-                       signal_heading_rect, _mouse_point);
-               s->paint_label(painter, signal_heading_rect, highlight);
+                       y, 0, w, _mouse_point);
+               s->paint_label(painter, y, w, highlight);
        }
 
        painter.end();
@@ -200,7 +193,7 @@ void Header::mouseMoveEvent(QMouseEvent *event)
        update();
 }
 
-void Header::leaveEvent(QEvent *event)
+void Header::leaveEvent(QEvent*)
 {
        _mouse_point = QPoint(-1, -1);
        update();
@@ -224,14 +217,16 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
 
 void Header::on_action_set_name_triggered()
 {
+       bool ok = false;
+
        shared_ptr<view::Signal> context_signal = _context_signal;
        if (!context_signal)
                return;
 
        const QString new_label = QInputDialog::getText(this, tr("Set Name"),
-               tr("Name"), QLineEdit::Normal, context_signal->get_name());
+               tr("Name"), QLineEdit::Normal, context_signal->get_name(), &ok);
 
-       if (!new_label.isEmpty())
+       if (ok)
                context_signal->set_name(new_label);
 }