projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix an isnan() issue on (at least) MinGW and Mac OS X.
[pulseview.git]
/
pv
/
view
/
viewitem.cpp
diff --git
a/pv/view/viewitem.cpp
b/pv/view/viewitem.cpp
index b3498ac159434ea6d36c2404bcedcca025e52d52..1492d14d8d1d45851769dadb6f9af9278c50ae98 100644
(file)
--- a/
pv/view/viewitem.cpp
+++ b/
pv/view/viewitem.cpp
@@
-29,12
+29,13
@@
namespace pv {
namespace view {
namespace pv {
namespace view {
-const int ViewItem::HighlightRadius = 6;
+const QSizeF ViewItem::LabelPadding(4, 0);
+const int ViewItem::HighlightRadius = 3;
ViewItem::ViewItem() :
context_parent_(NULL),
ViewItem::ViewItem() :
context_parent_(NULL),
-
selected_(false
),
-
drag_point_(INT_MIN, INT_MIN
)
+
drag_point_(INT_MIN, INT_MIN
),
+
selected_(false
)
{
}
{
}
@@
-53,14
+54,9
@@
bool ViewItem::dragging() const
return drag_point_.x() != INT_MIN && drag_point_.y() != INT_MIN;
}
return drag_point_.x() != INT_MIN && drag_point_.y() != INT_MIN;
}
-QPoint ViewItem::drag_point() const
-{
- return drag_point_;
-}
-
void ViewItem::drag()
{
void ViewItem::drag()
{
- drag_point_ = point();
+ drag_point_ = point(
QRect()
);
}
void ViewItem::drag_release()
}
void ViewItem::drag_release()
@@
-68,6
+64,12
@@
void ViewItem::drag_release()
drag_point_ = QPoint(INT_MIN, INT_MIN);
}
drag_point_ = QPoint(INT_MIN, INT_MIN);
}
+QRectF ViewItem::hit_box_rect(const QRectF &rect) const
+{
+ (void)rect;
+ return QRectF();
+}
+
QMenu* ViewItem::create_context_menu(QWidget *parent)
{
context_parent_ = parent;
QMenu* ViewItem::create_context_menu(QWidget *parent)
{
context_parent_ = parent;
@@
-81,7
+83,7
@@
void ViewItem::delete_pressed()
QPen ViewItem::highlight_pen()
{
return QPen(QApplication::palette().brush(
QPen ViewItem::highlight_pen()
{
return QPen(QApplication::palette().brush(
- QPalette::Highlight), HighlightRadius,
+ QPalette::Highlight), HighlightRadius
* 2
,
Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
}
Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
}