projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Header: Renamed get_mouse_over_row_item to get_mouse_over_item
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index 837d1916c72a69f10e8e460cbc2296c2cc88408d..c19d10883af7fed3c77e3ee60d0f497faadb2958 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-62,9
+62,6
@@
static bool item_selected(shared_ptr<RowItem> r)
Header::Header(View &parent) :
MarginWidget(parent)
{
Header::Header(View &parent) :
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()));
}
@@
-78,9
+75,14
@@
QSize Header::sizeHint() const
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 QRect r(
BaselineOffset
, 0, width() - BaselineOffset, height());
+ const QRect r(
0
, 0, width() - BaselineOffset, height());
for (auto &i : view_)
if (i->enabled() && i->label_rect(r).contains(pt))
return i;
for (auto &i : view_)
if (i->enabled() && i->label_rect(r).contains(pt))
return i;
@@
-112,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 QRect rect(
BaselineOffset
, 0, width() - BaselineOffset, height());
+ 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());
@@
-171,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);
@@
-186,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();
@@
-271,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;