#include <pv/widgets/popup.h>
-using boost::shared_ptr;
using std::max;
using std::make_pair;
using std::pair;
+using std::shared_ptr;
using std::vector;
namespace pv {
namespace view {
const int Header::Padding = 12;
+const int Header::BaselineOffset = 5;
Header::Header(View &parent) :
MarginWidget(parent),
}
}
- return QSize(max_width + Padding, 0);
+ return QSize(max_width + Padding + BaselineOffset, 0);
}
shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
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);
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();
const int delta = event->pos().y() - _mouse_down_point.y();
for (auto i = _drag_traces.begin(); i != _drag_traces.end(); i++) {
- const boost::shared_ptr<Trace> trace((*i).first);
+ const std::shared_ptr<Trace> trace((*i).first);
if (trace) {
const int y = (*i).second + delta;
const int y_snap =