Merge pull request #1284 from gqrx-sdr/elide-band-names

Shorten band names to fit in narrow spaces
gqrx-sdr · Sep 29, 2023 · af47867 · af47867
2 parents 707e6c1 + f02d325
commit af47867
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/resources/news.txt b/resources/news.txt
@@ -28,6 +28,7 @@
   IMPROVED: Use logarithmic scale for frequency zoom slider.
   IMPROVED: Reduced CPU utilization of demodulators.
   IMPROVED: Properly handle smooth scrolling.
+  IMPROVED: Shorten band names to fit in narrow spaces.
    CHANGED: Frequency zoom slider zooms around center of display.
    CHANGED: Disallow scrolling beyond the FFT frequency limits.
    CHANGED: Default narrow FM deviation increased to 5 kHz.

diff --git a/src/qtgui/plotter.cpp b/src/qtgui/plotter.cpp
@@ -2114,15 +2114,11 @@ void CPlotter::drawOverlay()
             int band_width = band_right - band_left;
             QRectF rect(band_left, xAxisTop - m_BandPlanHeight, band_width, m_BandPlanHeight);
             painter.fillRect(rect, band.color);
-            QString band_label = band.name + " (" + band.modulation + ")";
-            qreal textWidth = metrics.boundingRect(band_label).width();
-            if (band_left < w && band_width > textWidth + 20)
-            {
-                painter.setOpacity(1.0);
-                QRectF textRect(band_left, xAxisTop - m_BandPlanHeight, band_width, metrics.height());
-                painter.setPen(QPen(QColor(PLOTTER_TEXT_COLOR), m_DPR));
-                painter.drawText(textRect, Qt::AlignCenter, band_label);
-            }
+            QString band_label = metrics.elidedText(band.name + " (" + band.modulation + ")", Qt::ElideRight, band_width - 10);
+            painter.setOpacity(1.0);
+            QRectF textRect(band_left, xAxisTop - m_BandPlanHeight, band_width, metrics.height());
+            painter.setPen(QPen(QColor(PLOTTER_TEXT_COLOR), m_DPR));
+            painter.drawText(textRect, Qt::AlignCenter, band_label);
         }
     }