projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ViewItem: Make paint_label optional
[pulseview.git]
/
pv
/
view
/
viewitem.cpp
diff --git
a/pv/view/viewitem.cpp
b/pv/view/viewitem.cpp
index 1492d14d8d1d45851769dadb6f9af9278c50ae98..0c61578c0c2acfcb1517e40009a5a91675568caa 100644
(file)
--- a/
pv/view/viewitem.cpp
+++ b/
pv/view/viewitem.cpp
@@
-33,7
+33,7
@@
const QSizeF ViewItem::LabelPadding(4, 0);
const int ViewItem::HighlightRadius = 3;
ViewItem::ViewItem() :
const int ViewItem::HighlightRadius = 3;
ViewItem::ViewItem() :
- context_parent_(
NULL
),
+ context_parent_(
nullptr
),
drag_point_(INT_MIN, INT_MIN),
selected_(false)
{
drag_point_(INT_MIN, INT_MIN),
selected_(false)
{
@@
-76,6
+76,12
@@
QMenu* ViewItem::create_context_menu(QWidget *parent)
return new QMenu(parent);
}
return new QMenu(parent);
}
+widgets::Popup* ViewItem::create_popup(QWidget *parent)
+{
+ (void)parent;
+ return nullptr;
+}
+
void ViewItem::delete_pressed()
{
}
void ViewItem::delete_pressed()
{
}
@@
-87,6
+93,13
@@
QPen ViewItem::highlight_pen()
Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
}
Qt::SolidLine, Qt::RoundCap, Qt::RoundJoin);
}
+void ViewItem::paint_label(QPainter &p, const QRect &rect, bool hover)
+{
+ (void)p;
+ (void)rect;
+ (void)hover;
+}
+
void ViewItem::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
(void)p;
void ViewItem::paint_back(QPainter &p, const ViewItemPaintParams &pp)
{
(void)p;
@@
-107,7
+120,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