projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewWidget: Moved in unified accept_drag
[pulseview.git]
/
pv
/
view
/
timemarker.cpp
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 614275cf98e04d1d559d211cae6bf9740f595b15..894f023bf11c4d547db8649398905a8e57c8abe8 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-74,9
+74,9
@@
float TimeMarker::get_x() const
return (time_ - view_.offset()) / view_.scale();
}
return (time_ - view_.offset()) / view_.scale();
}
-QPoint TimeMarker::point() const
+QPoint TimeMarker::point(
const QRect &rect
) const
{
{
- return QPoint(get_x(),
0
);
+ return QPoint(get_x(),
rect.bottom()
);
}
QRectF TimeMarker::label_rect(const QRectF &rect) const
}
QRectF TimeMarker::label_rect(const QRectF &rect) const
@@
-159,6
+159,9
@@
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
using pv::widgets::Popup;
Popup *const popup = new Popup(parent);
using pv::widgets::Popup;
Popup *const popup = new Popup(parent);
+ popup->set_position(parent->mapToGlobal(
+ point(parent->rect())), Popup::Bottom);
+
QFormLayout *const form = new QFormLayout(popup);
popup->setLayout(form);
QFormLayout *const form = new QFormLayout(popup);
popup->setLayout(form);