projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RowItem: Split appart visual and layout v offsets
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index b9261f9753d060bdaffbb48ab7c52a35d4a5210b..2264bc2c945f96b41ea88d387af4c5221d3a8cb9 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-101,7
+101,7
@@
void Header::show_popup(const shared_ptr<RowItem> &item)
if (!p)
return;
if (!p)
return;
- const QPoint pt(width() - BaselineOffset, item->get_y());
+ const QPoint pt(width() - BaselineOffset, item->get_
visual_
y());
p->set_position(mapToGlobal(pt), Popup::Right);
p->show();
}
p->set_position(mapToGlobal(pt), Popup::Right);
p->show();
}
@@
-118,7
+118,7
@@
void Header::paintEvent(QPaintEvent*)
stable_sort(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
stable_sort(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
- return a->v
_offset() < b->
v_offset(); });
+ return a->v
isual_v_offset() < b->visual_
v_offset(); });
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
QPainter painter(this);
painter.setRenderHint(QPainter::Antialiasing);
@@
-137,26
+137,26
@@
void Header::paintEvent(QPaintEvent*)
void Header::mouseLeftPressEvent(QMouseEvent *event)
{
void Header::mouseLeftPressEvent(QMouseEvent *event)
{
+ (void)event;
+
const bool ctrl_pressed =
QApplication::keyboardModifiers() & Qt::ControlModifier;
// Clear selection if control is not pressed and this item is unselected
const bool ctrl_pressed =
QApplication::keyboardModifiers() & Qt::ControlModifier;
// Clear selection if control is not pressed and this item is unselected
- const shared_ptr<RowItem> mouse_over =
- get_mouse_over_row_item(event->pos());
- if (!ctrl_pressed && (!mouse_over || !mouse_over->selected()))
+ if ((!_mouse_down_item || !_mouse_down_item->selected()) &&
+ !ctrl_pressed)
for (shared_ptr<RowItem> r : _view)
r->select(false);
// Set the signal selection state if the item has been clicked
for (shared_ptr<RowItem> r : _view)
r->select(false);
// Set the signal selection state if the item has been clicked
- if (
mouse_over
) {
+ if (
_mouse_down_item
) {
if (ctrl_pressed)
if (ctrl_pressed)
-
mouse_over->select(!mouse_over
->selected());
+
_mouse_down_item->select(!_mouse_down_item
->selected());
else
else
-
mouse_over
->select(true);
+
_mouse_down_item
->select(true);
}
// Save the offsets of any signals which will be dragged
}
// Save the offsets of any signals which will be dragged
- _mouse_down_point = event->pos();
for (const shared_ptr<RowItem> r : _view)
if (r->selected())
r->drag();
for (const shared_ptr<RowItem> r : _view)
if (r->selected())
r->drag();
@@
-168,6
+168,10
@@
void Header::mouseLeftPressEvent(QMouseEvent *event)
void Header::mousePressEvent(QMouseEvent *event)
{
assert(event);
void Header::mousePressEvent(QMouseEvent *event)
{
assert(event);
+
+ _mouse_down_point = event->pos();
+ _mouse_down_item = get_mouse_over_row_item(event->pos());
+
if (event->button() & Qt::LeftButton)
mouseLeftPressEvent(event);
}
if (event->button() & Qt::LeftButton)
mouseLeftPressEvent(event);
}
@@
-186,17
+190,15
@@
void Header::mouseLeftReleaseEvent(QMouseEvent *event)
for (auto &r : _view)
r->drag_release();
for (auto &r : _view)
r->drag_release();
- if (_dragging)
- _view.normalize_layout();
- else
+ if (!_dragging)
{
if (!ctrl_pressed) {
for (shared_ptr<RowItem> r : _view)
{
if (!ctrl_pressed) {
for (shared_ptr<RowItem> r : _view)
- if (
mouse_over
!= r)
+ if (
_mouse_down_item
!= r)
r->select(false);
r->select(false);
- if (
mouse_over
)
- show_popup(
mouse_over
);
+ if (
_mouse_down_item
)
+ show_popup(
_mouse_down_item
);
}
}
}
}
@@
-208,6
+210,8
@@
void Header::mouseReleaseEvent(QMouseEvent *event)
assert(event);
if (event->button() & Qt::LeftButton)
mouseLeftReleaseEvent(event);
assert(event);
if (event->button() & Qt::LeftButton)
mouseLeftReleaseEvent(event);
+
+ _mouse_down_item = nullptr;
}
void Header::mouseMoveEvent(QMouseEvent *event)
}
void Header::mouseMoveEvent(QMouseEvent *event)
@@
-242,7
+246,7
@@
void Header::mouseMoveEvent(QMouseEvent *event)
for (std::shared_ptr<RowItem> r : _view)
if (r->dragging()) {
for (std::shared_ptr<RowItem> r : _view)
if (r->dragging()) {
- r->
set
_v_offset(r->drag_point().y() + delta);
+ r->
force_to
_v_offset(r->drag_point().y() + delta);
// Ensure the trace is selected
r->select();
// Ensure the trace is selected
r->select();