namespace view {
const int Header::Padding = 12;
+const int Header::BaselineOffset = 5;
Header::Header(View &parent) :
MarginWidget(parent),
assert(t);
if (t->enabled()) {
- max_width = max(max_width, (int)t->get_label_rect(0).width());
+ max_width = max(max_width, (int)t->label_rect(0).width());
}
}
- return QSize(max_width + Padding, 0);
+ return QSize(max_width + Padding + BaselineOffset, 0);
}
shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
{
- const int w = width();
+ const int w = width() - BaselineOffset;
const vector< shared_ptr<Trace> > traces(_view.get_traces());
for (const shared_ptr<Trace> t : traces)
{
assert(t);
- if (t->pt_in_label_rect(0, w, pt))
+ if (t->enabled() && t->label_rect(w).contains(pt))
return t;
}
void Header::paintEvent(QPaintEvent*)
{
- const int w = width();
+ // The trace labels are not drawn with the arrows exactly on the
+ // left edge of the widget, because then the selection shadow
+ // would be clipped away.
+ const int w = width() - BaselineOffset;
const vector< shared_ptr<Trace> > traces(_view.get_traces());
QPainter painter(this);
{
assert(t);
- const bool highlight = !dragging && t->pt_in_label_rect(
- 0, w, _mouse_point);
+ const bool highlight = !dragging &&
+ t->label_rect(w).contains(_mouse_point);
t->paint_label(painter, w, highlight);
}
for (const shared_ptr<Trace> t : traces)
if (t->selected())
_drag_traces.push_back(
- make_pair(t, t->get_v_offset()));
+ make_pair(t, t->v_offset()));
}
// Select the signal if it has been clicked
if (event->button() & Qt::LeftButton)
_drag_traces.push_back(
make_pair(mouse_over_trace,
- mouse_over_trace->get_v_offset()));
+ mouse_over_trace->v_offset()));
}
}
const shared_ptr<Trace> mouse_over_trace =
get_mouse_over_trace(event->pos());
if (mouse_over_trace) {
+ const int w = width() - BaselineOffset;
Popup *const p =
mouse_over_trace->create_popup(&_view);
- p->set_position(mapToGlobal(QPoint(width(),
+ p->set_position(mapToGlobal(QPoint(w,
mouse_over_trace->get_y())),
Popup::Right);
p->show();