From 9ea3ed47a68150907e229b96df8d5025ea41b9f1 Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Tue, 12 Sep 2023 23:55:00 -0500
Subject: [PATCH] Use unit library to perform font size conversions

---
 scwx-qt/source/scwx/qt/main/main.cpp        |  2 ++
 scwx-qt/source/scwx/qt/types/font_types.hpp | 26 +++++++++++++++++++++
 scwx-qt/source/scwx/qt/util/tooltip.cpp     | 14 ++++++-----
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/scwx-qt/source/scwx/qt/main/main.cpp b/scwx-qt/source/scwx/qt/main/main.cpp
index 274c13ca..b841b846 100644
--- a/scwx-qt/source/scwx/qt/main/main.cpp
+++ b/scwx-qt/source/scwx/qt/main/main.cpp
@@ -1,3 +1,5 @@
+#define NOMINMAX
+
 #include <scwx/qt/config/radar_site.hpp>
 #include <scwx/qt/main/main_window.hpp>
 #include <scwx/qt/main/versions.hpp>
diff --git a/scwx-qt/source/scwx/qt/types/font_types.hpp b/scwx-qt/source/scwx/qt/types/font_types.hpp
index c6f42506..6fc8c506 100644
--- a/scwx-qt/source/scwx/qt/types/font_types.hpp
+++ b/scwx-qt/source/scwx/qt/types/font_types.hpp
@@ -1,5 +1,31 @@
 #pragma once
 
+#include <units/core.h>
+
+namespace units
+{
+
+namespace dimension
+{
+
+struct font_size_tag
+{
+   static constexpr const char* const name         = "font size";
+   static constexpr const char* const abbreviation = "px";
+};
+
+using font_size = make_dimension<font_size_tag>;
+
+} // namespace dimension
+
+UNIT_ADD(font_size,
+         pixels,
+         px,
+         conversion_factor<std::ratio<1>, dimension::font_size>)
+UNIT_ADD(font_size, points, pt, conversion_factor<std::ratio<4, 3>, pixels<>>)
+
+} // namespace units
+
 namespace scwx
 {
 namespace qt
diff --git a/scwx-qt/source/scwx/qt/util/tooltip.cpp b/scwx-qt/source/scwx/qt/util/tooltip.cpp
index cc5d0ff1..6145225a 100644
--- a/scwx-qt/source/scwx/qt/util/tooltip.cpp
+++ b/scwx-qt/source/scwx/qt/util/tooltip.cpp
@@ -1,6 +1,7 @@
 #include <scwx/qt/util/tooltip.hpp>
 #include <scwx/qt/manager/settings_manager.hpp>
 #include <scwx/qt/settings/text_settings.hpp>
+#include <scwx/qt/types/font_types.hpp>
 #include <scwx/qt/util/imgui.hpp>
 #include <scwx/util/logger.hpp>
 
@@ -101,21 +102,22 @@ void Show(const std::string& text, const QPointF& mouseGlobalPos)
    else if (tooltipMethod_ == TooltipMethod::QLabel)
    {
       // Get monospace font size
-      std::size_t fontSize = 16;
-      auto        fontSizes =
+      units::font_size::pixels<double> fontSize {16};
+      auto                             fontSizes =
          manager::SettingsManager::general_settings().font_sizes().GetValue();
       if (fontSizes.size() > 1)
       {
-         fontSize = fontSizes[1];
+         fontSize = units::font_size::pixels<double> {fontSizes[1]};
       }
       else if (fontSizes.size() > 0)
       {
-         fontSize = fontSizes[0];
+         fontSize = units::font_size::pixels<double> {fontSizes[0]};
       }
 
       // Configure the label
-      tooltipLabel_->setFont(
-         QFont("Inconsolata", static_cast<int>(std::round(fontSize * 0.72))));
+      QFont font("Inconsolata");
+      font.setPointSizeF(units::font_size::points<double>(fontSize).value());
+      tooltipLabel_->setFont(font);
       tooltipLabel_->setText(QString::fromStdString(displayText));
 
       // Get the screen the label will be displayed on