projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewItem: Moved in LabelPadding
[pulseview.git]
/
pv
/
view
/
cursor.cpp
diff --git
a/pv/view/cursor.cpp
b/pv/view/cursor.cpp
index 836d0e93d758fd911e371ef5383eda291ffa41c6..0ea6f5ab7b0c5e3edbc21b64600bc06e2f1346dd 100644
(file)
--- a/
pv/view/cursor.cpp
+++ b/
pv/view/cursor.cpp
@@
-55,7
+55,7
@@
QString Cursor::get_text() const
return pv::util::format_time(time_, view_.tick_prefix(), 2);
}
return pv::util::format_time(time_, view_.tick_prefix(), 2);
}
-QRectF Cursor::
get_label_rect(const QRect
&rect) const
+QRectF Cursor::
label_rect(const QRectF
&rect) const
{
const shared_ptr<Cursor> other(get_other_cursor());
assert(other);
{
const shared_ptr<Cursor> other(get_other_cursor());
assert(other);
@@
-66,10
+66,10
@@
QRectF Cursor::get_label_rect(const QRect &rect) const
QSize text_size = m.boundingRect(get_text()).size();
const QSizeF label_size(
QSize text_size = m.boundingRect(get_text()).size();
const QSizeF label_size(
- text_size.width() +
View::
LabelPadding.width() * 2,
- text_size.height() +
View::
LabelPadding.height() * 2);
+ text_size.width() + LabelPadding.width() * 2,
+ text_size.height() + LabelPadding.height() * 2);
const float top = rect.height() - label_size.height() -
const float top = rect.height() - label_size.height() -
- TimeMarker::
Offset - TimeMarker::
ArrowSize - 0.5f;
+ TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
if (time_ > other->time())
const float height = label_size.height();
if (time_ > other->time())