projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewItem: Make a create_popup optional
[pulseview.git]
/
pv
/
view
/
viewitem.cpp
diff --git
a/pv/view/viewitem.cpp
b/pv/view/viewitem.cpp
index 6917190a46dbd8e60554cc241219a2fc62de4743..662c15de0a46d46392fc97ff6145488c85910533 100644
(file)
--- a/
pv/view/viewitem.cpp
+++ b/
pv/view/viewitem.cpp
@@
-33,9
+33,9
@@
const QSizeF ViewItem::LabelPadding(4, 0);
const int ViewItem::HighlightRadius = 3;
ViewItem::ViewItem() :
const int ViewItem::HighlightRadius = 3;
ViewItem::ViewItem() :
- context_parent_(
NULL
),
-
selected_(false
),
-
drag_point_(INT_MIN, INT_MIN
)
+ context_parent_(
nullptr
),
+
drag_point_(INT_MIN, INT_MIN
),
+
selected_(false
)
{
}
{
}
@@
-54,11
+54,6
@@
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()
{
drag_point_ = point(QRect());
void ViewItem::drag()
{
drag_point_ = point(QRect());
@@
-69,12
+64,24
@@
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;
return new QMenu(parent);
}
QMenu* ViewItem::create_context_menu(QWidget *parent)
{
context_parent_ = parent;
return new QMenu(parent);
}
+widgets::Popup* ViewItem::create_popup(QWidget *parent)
+{
+ (void)parent;
+ return nullptr;
+}
+
void ViewItem::delete_pressed()
{
}
void ViewItem::delete_pressed()
{
}
@@
-106,7
+113,7
@@
void ViewItem::paint_fore(QPainter &p, const ViewItemPaintParams &pp)
QColor ViewItem::select_text_colour(QColor background)
{
QColor ViewItem::select_text_colour(QColor background)
{
- return (background.lightness() >
64
) ? Qt::black : Qt::white;
+ return (background.lightness() >
110
) ? Qt::black : Qt::white;
}
} // namespace view
}
} // namespace view