projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewItem: Use drag_point() with drag_by()
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index 2269849c24da9886fd3ff132dfffb7e27bf017a4..77ac1aa88c343498bfcaf57939b4f0995862b54a 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-60,12
+60,8
@@
static bool item_selected(shared_ptr<RowItem> r)
}
Header::Header(View &parent) :
}
Header::Header(View &parent) :
- MarginWidget(parent),
- dragging_(false)
+ MarginWidget(parent)
{
{
- setFocusPolicy(Qt::ClickFocus);
- setMouseTracking(true);
-
connect(&view_, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
}
connect(&view_, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
}
@@
-75,15
+71,20
@@
QSize Header::sizeHint() const
QRectF max_rect(-Padding, 0, Padding, 0);
for (auto &i : view_)
if (i->enabled())
QRectF max_rect(-Padding, 0, Padding, 0);
for (auto &i : view_)
if (i->enabled())
- max_rect = max_rect.united(i->label_rect(
0
));
+ max_rect = max_rect.united(i->label_rect(
QRect()
));
return QSize(max_rect.width() + Padding + BaselineOffset, 0);
}
return QSize(max_rect.width() + Padding + BaselineOffset, 0);
}
-shared_ptr<RowItem> Header::get_mouse_over_row_item(const QPoint &pt)
+QSize Header::extended_size_hint() const
+{
+ return sizeHint() + QSize(ViewItem::HighlightRadius, 0);
+}
+
+shared_ptr<RowItem> Header::get_mouse_over_item(const QPoint &pt)
{
{
- const
int w = width() - BaselineOffset
;
+ const
QRect r(0, 0, width() - BaselineOffset, height())
;
for (auto &i : view_)
for (auto &i : view_)
- if (i->enabled() && i->label_rect(
w
).contains(pt))
+ if (i->enabled() && i->label_rect(
r
).contains(pt))
return i;
return shared_ptr<RowItem>();
}
return i;
return shared_ptr<RowItem>();
}
@@
-113,7
+114,7
@@
void Header::paintEvent(QPaintEvent*)
// 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.
// 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
QRect rect(0, 0, width() - BaselineOffset, height())
;
vector< shared_ptr<RowItem> > row_items(
view_.begin(), view_.end());
vector< shared_ptr<RowItem> > row_items(
view_.begin(), view_.end());
@@
-130,8
+131,8
@@
void Header::paintEvent(QPaintEvent*)
assert(r);
const bool highlight = !dragging_ &&
assert(r);
const bool highlight = !dragging_ &&
- r->label_rect(
w
).contains(mouse_point_);
- r->paint_label(painter,
w
, highlight);
+ r->label_rect(
rect
).contains(mouse_point_);
+ r->paint_label(painter,
rect
, highlight);
}
painter.end();
}
painter.end();
@@
-172,7
+173,7
@@
void Header::mousePressEvent(QMouseEvent *event)
assert(event);
mouse_down_point_ = event->pos();
assert(event);
mouse_down_point_ = event->pos();
- mouse_down_item_ = get_mouse_over_
row_
item(event->pos());
+ mouse_down_item_ = get_mouse_over_item(event->pos());
if (event->button() & Qt::LeftButton)
mouseLeftPressEvent(event);
if (event->button() & Qt::LeftButton)
mouseLeftPressEvent(event);
@@
-187,7
+188,7
@@
void Header::mouseLeftReleaseEvent(QMouseEvent *event)
// Unselect everything if control is not pressed
const shared_ptr<RowItem> mouse_over =
// Unselect everything if control is not pressed
const shared_ptr<RowItem> mouse_over =
- get_mouse_over_
row_
item(event->pos());
+ get_mouse_over_item(event->pos());
for (auto &r : view_)
r->drag_release();
for (auto &r : view_)
r->drag_release();
@@
-246,11
+247,11
@@
void Header::mouseMoveEvent(QMouseEvent *event)
// Do the drag
dragging_ = true;
// Do the drag
dragging_ = true;
- const
int delta = event->pos().y() - mouse_down_point_.y()
;
+ const
QPoint delta = event->pos() - mouse_down_point_
;
for (std::shared_ptr<RowItem> r : view_)
if (r->dragging()) {
for (std::shared_ptr<RowItem> r : view_)
if (r->dragging()) {
- r->
force_to_v_offset(r->drag_point().y() +
delta);
+ r->
drag_by(
delta);
// Ensure the trace is selected
r->select();
// Ensure the trace is selected
r->select();
@@
-272,7
+273,7
@@
void Header::leaveEvent(QEvent*)
void Header::contextMenuEvent(QContextMenuEvent *event)
{
void Header::contextMenuEvent(QContextMenuEvent *event)
{
- const shared_ptr<RowItem> r = get_mouse_over_
row_
item(mouse_point_);
+ const shared_ptr<RowItem> r = get_mouse_over_item(mouse_point_);
if (!r)
return;
if (!r)
return;