projects
/
pulseview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
096fb58
)
TimeMarker: Clamp to minimum size
author
Joel Holdsworth
<joel@airwebreathe.org.uk>
Sun, 30 Nov 2014 16:36:31 +0000
(16:36 +0000)
committer
Uwe Hermann
<uwe@hermann-uwe.de>
Wed, 10 Dec 2014 17:06:15 +0000
(18:06 +0100)
pv/view/timemarker.cpp
patch
|
blob
|
history
diff --git
a/pv/view/timemarker.cpp
b/pv/view/timemarker.cpp
index 2f129a3297f985bd7222b4c302d98db6e2fe9c4c..d1c16ba8a9339f665fe0064e09cd80c1dc293567 100644
(file)
--- a/
pv/view/timemarker.cpp
+++ b/
pv/view/timemarker.cpp
@@
-92,16
+92,18
@@
QRectF TimeMarker::get_label_rect(const QRect &rect) const
const float x = (time_ - view_.offset()) / view_.scale();
QFontMetrics m(QApplication::font());
const float x = (time_ - view_.offset()) / view_.scale();
QFontMetrics m(QApplication::font());
- QSize text_size = m.boundingRect(get_text()).size();
+ const float text_width =
+ max(m.boundingRect(get_text()).size().width(), ArrowSize);
+ const float text_height = m.boundingRect("Tg").size().height();
const QSizeF label_size(
const QSizeF label_size(
- text_
size.width()
+ View::LabelPadding.width() * 2,
- text_
size.height()
+ View::LabelPadding.height() * 2);
+ text_
width
+ View::LabelPadding.width() * 2,
+ text_
height
+ View::LabelPadding.height() * 2);
const float top = rect.height() - label_size.height() -
TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
const float top = rect.height() - label_size.height() -
TimeMarker::Offset - TimeMarker::ArrowSize - 0.5f;
const float height = label_size.height();
- return QRectF(x - label_size.width() / 2
- 0.5f
, top,
+ return QRectF(x - label_size.width() / 2, top,
label_size.width(), height);
}
label_size.width(), height);
}