projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Decouple horizontal scrolling from the scoll bar
[pulseview.git]
/
pv
/
view
/
header.cpp
diff --git
a/pv/view/header.cpp
b/pv/view/header.cpp
index 63679012a52947d92b7d1fc67f40948a042f339b..e0e280b2826dc3c988c362d1c2eaecaf0a508f29 100644
(file)
--- a/
pv/view/header.cpp
+++ b/
pv/view/header.cpp
@@
-71,18
+71,15
@@
boost::shared_ptr<pv::view::Signal> Header::get_mouse_over_signal(
{
assert(s);
{
assert(s);
- const QRect signal_heading_rect(
- 0, s->get_v_offset() - v_offset,
- w, View::SignalHeight);
-
- if (s->pt_in_label_rect(signal_heading_rect, pt))
+ if (s->pt_in_label_rect(s->get_v_offset() - v_offset,
+ 0, w, pt))
return s;
}
return shared_ptr<Signal>();
}
return s;
}
return shared_ptr<Signal>();
}
-void Header::paintEvent(QPaintEvent
*event
)
+void Header::paintEvent(QPaintEvent
*
)
{
const int w = width();
const vector< shared_ptr<Signal> > sigs(
{
const int w = width();
const vector< shared_ptr<Signal> > sigs(
@@
-97,13
+94,10
@@
void Header::paintEvent(QPaintEvent *event)
{
assert(s);
{
assert(s);
- const QRect signal_heading_rect(
- 0, s->get_v_offset() - v_offset,
- w, View::SignalHeight);
-
+ const int y = s->get_v_offset() - v_offset;
const bool highlight = !dragging && s->pt_in_label_rect(
const bool highlight = !dragging && s->pt_in_label_rect(
-
signal_heading_rect
, _mouse_point);
- s->paint_label(painter,
signal_heading_rect
, highlight);
+
y, 0, w
, _mouse_point);
+ s->paint_label(painter,
y, w
, highlight);
}
painter.end();
}
painter.end();
@@
-200,7
+194,7
@@
void Header::mouseMoveEvent(QMouseEvent *event)
update();
}
update();
}
-void Header::leaveEvent(QEvent
*event
)
+void Header::leaveEvent(QEvent
*
)
{
_mouse_point = QPoint(-1, -1);
update();
{
_mouse_point = QPoint(-1, -1);
update();