From ab6d2eabbab741cd9233cf731f22faaae621fc8a Mon Sep 17 00:00:00 2001
From: Joel Holdsworth <joel@airwebreathe.org.uk>
Date: Sun, 6 Sep 2015 17:57:54 -0600
Subject: [PATCH] LogicSignal: Replaced SignalMargin with half font-height

---
 pv/view/logicsignal.cpp | 6 ++++--
 pv/view/logicsignal.hpp | 1 -
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 573d1b78..2967147f 100644
--- 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,9 @@ 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
diff --git a/pv/view/logicsignal.hpp b/pv/view/logicsignal.hpp
index 71dcc036..63d2ec4a 100644
--- a/pv/view/logicsignal.hpp
+++ b/pv/view/logicsignal.hpp
@@ -52,7 +52,6 @@ class LogicSignal : public Signal
 
 private:
 	static const int SignalHeight;
-	static const int SignalMargin;
 
 	static const float Oversampling;
 
-- 
2.30.2