projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Change QApplication::translate to tr, removing deprecated UTF8 parameter
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index 7c68f302846b5b4f6d41b020abdef6c15f98df69..2e497761b18a761ca6dd4785252e7bfc96e0030a 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-34,16
+34,17
@@
#include <pv/widgets/popup.h>
#include <pv/widgets/popup.h>
-using boost::shared_ptr;
using std::max;
using std::make_pair;
using std::pair;
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;
using std::vector;
namespace pv {
namespace view {
const int Header::Padding = 12;
+const int Header::BaselineOffset = 5;
Header::Header(View &parent) :
MarginWidget(parent),
Header::Header(View &parent) :
MarginWidget(parent),
@@
-76,7
+77,7
@@
QSize Header::sizeHint() const
}
}
}
}
- return QSize(max_width + Padding, 0);
+ return QSize(max_width + Padding
+ BaselineOffset
, 0);
}
shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
}
shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
@@
-107,7
+108,10
@@
void Header::clear_selection()
void Header::paintEvent(QPaintEvent*)
{
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 vector< shared_ptr<Trace> > traces(_view.get_traces());
QPainter painter(this);
@@
-188,9
+192,10
@@
void Header::mouseReleaseEvent(QMouseEvent *event)
const shared_ptr<Trace> mouse_over_trace =
get_mouse_over_trace(event->pos());
if (mouse_over_trace) {
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);
Popup *const p =
mouse_over_trace->create_popup(&_view);
- p->set_position(mapToGlobal(QPoint(w
idth()
,
+ p->set_position(mapToGlobal(QPoint(w,
mouse_over_trace->get_y())),
Popup::Right);
p->show();
mouse_over_trace->get_y())),
Popup::Right);
p->show();
@@
-222,7
+227,7
@@
void Header::mouseMoveEvent(QMouseEvent *event)
const int delta = event->pos().y() - _mouse_down_point.y();
for (auto i = _drag_traces.begin(); i != _drag_traces.end(); i++) {
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 =
if (trace) {
const int y = (*i).second + delta;
const int y_snap =