From 76448e64ee289227804e9fbb0b5ee14357e20035 Mon Sep 17 00:00:00 2001
From: Alexander Voronov <avv.0@ya.ru>
Date: Fri, 24 Mar 2023 22:59:34 +0300
Subject: [PATCH] LibreVNA-GUI: Use 'horizontalAdvance' instead of 'width' for
 text width

---
 .../LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp |  2 +-
 Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp       | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp b/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp
index 1457d42..3907709 100644
--- a/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/SpectrumAnalyzer/spectrumanalyzer.cpp
@@ -112,7 +112,7 @@ SpectrumAnalyzer::SpectrumAnalyzer(AppWindow *window, QString name)
 
     auto eStart = new SIUnitEdit("Hz", " kMG", 6);
     // calculate width required with expected string length
-    auto width = QFontMetrics(eStart->font()).width("3.00000GHz") + 15;
+    auto width = QFontMetrics(eStart->font()).horizontalAdvance("3.00000GHz") + 15;
     eStart->setFixedWidth(width);
     eStart->setToolTip("Start frequency");
     connect(eStart, &SIUnitEdit::valueChanged, this, &SpectrumAnalyzer::SetStartFreq);
diff --git a/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp b/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
index 22c6df6..eb88e05 100644
--- a/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
@@ -275,7 +275,7 @@ VNA::VNA(AppWindow *window, QString name)
 
     auto eStart = new SIUnitEdit("Hz", " kMG", 6);
     // calculate width required with expected string length
-    auto width = QFontMetrics(eStart->font()).width("3.00000GHz") + 15;
+    auto width = QFontMetrics(eStart->font()).horizontalAdvance("3.00000GHz") + 15;
     eStart->setFixedWidth(width);
     eStart->setToolTip("Start frequency");
     connect(eStart, &SIUnitEdit::valueChanged, this, &VNA::SetStartFreq);
@@ -337,7 +337,7 @@ VNA::VNA(AppWindow *window, QString name)
 
     // power sweep widgets
     auto sbPowerLow = new QDoubleSpinBox();
-    width = QFontMetrics(sbPowerLow->font()).width("-30.00dBm") + 20;
+    width = QFontMetrics(sbPowerLow->font()).horizontalAdvance("-30.00dBm") + 20;
     sbPowerLow->setFixedWidth(width);
     sbPowerLow->setRange(-100.0, 100.0);
     sbPowerLow->setSingleStep(0.25);
@@ -350,7 +350,7 @@ VNA::VNA(AppWindow *window, QString name)
     powerSweepActions.push_back(tb_sweep->addWidget(sbPowerLow));
 
     auto sbPowerHigh = new QDoubleSpinBox();
-    width = QFontMetrics(sbPowerHigh->font()).width("-30.00dBm") + 20;
+    width = QFontMetrics(sbPowerHigh->font()).horizontalAdvance("-30.00dBm") + 20;
     sbPowerHigh->setFixedWidth(width);
     sbPowerHigh->setRange(-100.0, 100.0);
     sbPowerHigh->setSingleStep(0.25);
@@ -363,7 +363,7 @@ VNA::VNA(AppWindow *window, QString name)
     powerSweepActions.push_back(tb_sweep->addWidget(sbPowerHigh));
 
     auto ePowerFreq = new SIUnitEdit("Hz", " kMG", 6);
-    width = QFontMetrics(ePowerFreq->font()).width("3.00000GHz") + 15;
+    width = QFontMetrics(ePowerFreq->font()).horizontalAdvance("3.00000GHz") + 15;
     ePowerFreq->setFixedWidth(width);
     ePowerFreq->setToolTip("Start frequency");
     connect(ePowerFreq, &SIUnitEdit::valueChanged, this, &VNA::SetPowerSweepFrequency);
@@ -377,7 +377,7 @@ VNA::VNA(AppWindow *window, QString name)
     // Acquisition toolbar
     auto tb_acq = new QToolBar("Acquisition");
     auto dbm = new QDoubleSpinBox();
-    width = QFontMetrics(dbm->font()).width("-30.00dBm") + 20;
+    width = QFontMetrics(dbm->font()).horizontalAdvance("-30.00dBm") + 20;
     dbm->setFixedWidth(width);
     dbm->setRange(-100.0, 100.0);
     dbm->setSingleStep(0.25);