LogicSignal: Replaced SignalMargin with half font-height

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 573d1b780645dd4304295f1543f66f0fb76f4835..2967147f63a5145774df02aa7bcae1dae558865b 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -25,6 +25,7 @@
 
 #include <algorithm>
 
 
 #include <algorithm>
 

+#include <QApplication>

 #include <QFormLayout>
 #include <QToolBar>
 
 #include <QFormLayout>
 #include <QToolBar>
 


@@ -60,7 +61,6 @@ namespace pv {
 namespace view {
 
 const int LogicSignal::SignalHeight = 30;
 namespace view {
 
 const int LogicSignal::SignalHeight = 30;

-const int LogicSignal::SignalMargin = 10;

 
 const float LogicSignal::Oversampling = 2.0f;
 
 
 const float LogicSignal::Oversampling = 2.0f;
 


@@ -147,7 +147,9 @@ void LogicSignal::set_logic_data(std::shared_ptr<pv::data::Logic> data)
 
 std::pair<int, int> LogicSignal::v_extents() const
 {
 
 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
 }
 
 int LogicSignal::scale_handle_offset() const

diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 71dcc0361404648091532a767209b9d88e9170bc..63d2ec4af54b6aaa3dfd79acc3b07e837267cae9 100644 (file)
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -52,7 +52,6 @@ class LogicSignal : public Signal
 
 private:
        static const int SignalHeight;
 
 private:
        static const int SignalHeight;

-       static const int SignalMargin;

 
        static const float Oversampling;
 
 
        static const float Oversampling;