projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Really fix #1125 (and maybe #1139)
[pulseview.git]
/
pv
/
views
/
trace
/
timemarker.cpp
diff --git
a/pv/views/trace/timemarker.cpp
b/pv/views/trace/timemarker.cpp
index 487496d9fd102d1c8c3f72295b0669259fbdf702..0718f3cc8780704315e0e649b39c146a7a0e11bf 100644
(file)
--- a/
pv/views/trace/timemarker.cpp
+++ b/
pv/views/trace/timemarker.cpp
@@
-78,7
+78,7
@@
float TimeMarker::get_x() const
return roundf(((time_ - view_.offset()) / view_.scale()).convert_to<float>()) + 0.5f;
}
return roundf(((time_ - view_.offset()) / view_.scale()).convert_to<float>()) + 0.5f;
}
-QPoint TimeMarker::point(const QRect &rect) const
+QPoint TimeMarker::
drag_
point(const QRect &rect) const
{
return QPoint(get_x(), rect.bottom());
}
{
return QPoint(get_x(), rect.bottom());
}
@@
-171,7
+171,7
@@
pv::widgets::Popup* TimeMarker::create_popup(QWidget *parent)
Popup *const popup = new Popup(parent);
popup->set_position(parent->mapToGlobal(
Popup *const popup = new Popup(parent);
popup->set_position(parent->mapToGlobal(
- point(parent->rect())), Popup::Bottom);
+
drag_
point(parent->rect())), Popup::Bottom);
QFormLayout *const form = new QFormLayout(popup);
popup->setLayout(form);
QFormLayout *const form = new QFormLayout(popup);
popup->setLayout(form);