Refactor tooltip display

scwx-qt/source/scwx/qt/util/imgui.cpp

@@ -1,12 +1,10 @@
 #include <scwx/qt/util/imgui.hpp>
 #include <scwx/qt/manager/resource_manager.hpp>
 #include <scwx/qt/manager/settings_manager.hpp>
-#include <scwx/qt/settings/text_settings.hpp>
 #include <scwx/util/logger.hpp>
 
 #include <mutex>
 
-#include <TextFlow.hpp>
 #include <imgui.h>
 
 namespace scwx
@@ -89,23 +87,9 @@ void ImGui::DrawTooltip(const std::string& hoverText)
 {
    p->Initialize();
 
-   std::size_t textWidth = static_cast<std::size_t>(
-      settings::TextSettings::Instance().hover_text_wrap().GetValue());
-
-   // Wrap text if enabled
-   std::string wrappedText {};
-   if (textWidth > 0)
-   {
-      wrappedText = TextFlow::Column(hoverText).width(textWidth).toString();
-   }
-
-   // Display text is either wrapped or unwrapped text (do this to avoid copy
-   // when not wrapping)
-   const std::string& displayText = (textWidth > 0) ? wrappedText : hoverText;
-
    ::ImGui::BeginTooltip();
    ::ImGui::PushFont(p->monospaceFont_);
-   ::ImGui::TextUnformatted(displayText.c_str());
+   ::ImGui::TextUnformatted(hoverText.c_str());
    ::ImGui::PopFont();
    ::ImGui::EndTooltip();
 }

scwx-qt/source/scwx/qt/util/tooltip.cpp

@@ -0,0 +1,42 @@
+#include <scwx/qt/util/tooltip.hpp>
+#include <scwx/qt/settings/text_settings.hpp>
+#include <scwx/qt/util/imgui.hpp>
+
+#include <TextFlow.hpp>
+
+namespace scwx
+{
+namespace qt
+{
+namespace util
+{
+namespace tooltip
+{
+
+static const std::string logPrefix_ = "scwx::qt::util::tooltip";
+
+void Show(const std::string& text, const QPointF& /* mouseGlobalPos */)
+{
+   std::size_t textWidth = static_cast<std::size_t>(
+      settings::TextSettings::Instance().hover_text_wrap().GetValue());
+
+   // Wrap text if enabled
+   std::string wrappedText {};
+   if (textWidth > 0)
+   {
+      wrappedText = TextFlow::Column(text).width(textWidth).toString();
+   }
+
+   // Display text is either wrapped or unwrapped text (do this to avoid copy
+   // when not wrapping)
+   const std::string& displayText = (textWidth > 0) ? wrappedText : text;
+
+   util::ImGui::Instance().DrawTooltip(displayText);
+}
+
+void Hide() {}
+
+} // namespace tooltip
+} // namespace util
+} // namespace qt
+} // namespace scwx

scwx-qt/source/scwx/qt/util/tooltip.hpp

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <string>
+
+#include <QPoint>
+
+namespace scwx
+{
+namespace qt
+{
+namespace util
+{
+namespace tooltip
+{
+
+void Show(const std::string& text, const QPointF& mouseGlobalPos);
+void Hide();
+
+} // namespace tooltip
+} // namespace util
+} // namespace qt
+} // namespace scwx