ViewItem: Make hit_box_rect take ViewItemPaintParams

[pulseview.git] / pv / view / logicsignal.cpp

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index b20e5f06bf457b2b7710085aa39addbe0cab3757..2967147f63a5145774df02aa7bcae1dae558865b 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -25,6 +25,7 @@
 
 #include <algorithm>
 
+#include <QApplication>
 #include <QFormLayout>
 #include <QToolBar>
 
@@ -60,7 +61,6 @@ namespace pv {
 namespace view {
 
 const int LogicSignal::SignalHeight = 30;
-const int LogicSignal::SignalMargin = 10;
 
 const float LogicSignal::Oversampling = 2.0f;
 
@@ -147,7 +147,19 @@ void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
 
 std::pair<int, int> LogicSignal::v_extents() const
 {
-       return make_pair(-SignalHeight - SignalMargin, SignalMargin);
+       const int signal_margin =
+               QFontMetrics(QApplication::font()).height() / 2;
+       return make_pair(-SignalHeight - signal_margin, signal_margin);
+}
+
+int LogicSignal::scale_handle_offset() const
+{
+       return SignalHeight;
+}
+
+void LogicSignal::scale_handle_dragged(int offset)
+{
+       (void)offset;
 }
 
 void LogicSignal::paint_back(QPainter &p, const ViewItemPaintParams &pp)
@@ -420,7 +432,7 @@ void LogicSignal::modify_trigger()
        if (trigger) {
                for (auto stage : trigger->stages()) {
                        const auto &matches = stage->matches();
-                       if (std::none_of(begin(matches), end(matches),
+                       if (std::none_of(matches.begin(), matches.end(),
                            [&](shared_ptr<TriggerMatch> match) {
                                        return match->channel() != channel_; }))
                                continue;