blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 16:40:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor tooltip display

Browse source
This commit is contained in:
Dan Paulat 2023-09-09 00:49:23 -05:00
parent 9ebc859756
commit 0badf01a92
8 changed files with 87 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scwx-qt/source/scwx/qt/gl/draw/placefile_icons.cpp
View file

@ -1,7 +1,7 @@
#include <scwx/qt/gl/draw/placefile_icons.hpp>
#include <scwx/qt/util/imgui.hpp>
#include <scwx/qt/util/maplibre.hpp>
#include <scwx/qt/util/texture_atlas.hpp>
#include <scwx/qt/util/tooltip.hpp>
#include <scwx/util/logger.hpp>
#include <execution>
@ -685,7 +685,7 @@ void PlacefileIcons::Impl::Update(bool textureAtlasChanged)
bool PlacefileIcons::RunMousePicking(
const QMapLibreGL::CustomLayerRenderParameters& params,
const QPointF& /* mouseLocalPos */,
const QPointF& /* mouseGlobalPos */,
const QPointF& mouseGlobalPos,
const glm::vec2& mouseCoords)
{
std::unique_lock lock {p->iconMutex_};
@ -774,7 +774,7 @@ bool PlacefileIcons::RunMousePicking(
if (it != p->currentHoverIcons_.crend())
{
itemPicked = true;
util::ImGui::Instance().DrawTooltip(it->di_->hoverText_);
util::tooltip::Show(it->di_->hoverText_, mouseGlobalPos);
}
return itemPicked;

6
scwx-qt/source/scwx/qt/gl/draw/placefile_lines.cpp
View file

@ -1,7 +1,7 @@
#include <scwx/qt/gl/draw/placefile_lines.hpp>
#include <scwx/qt/util/geographic_lib.hpp>
#include <scwx/qt/util/imgui.hpp>
#include <scwx/qt/util/maplibre.hpp>
#include <scwx/qt/util/tooltip.hpp>
#include <scwx/util/logger.hpp>
#include <execution>
@ -498,7 +498,7 @@ void PlacefileLines::Impl::Update()
bool PlacefileLines::RunMousePicking(
const QMapLibreGL::CustomLayerRenderParameters& params,
const QPointF& /* mouseLocalPos */,
const QPointF& /* mouseGlobalPos */,
const QPointF& mouseGlobalPos,
const glm::vec2& mouseCoords)
{
std::unique_lock lock {p->lineMutex_};
@ -589,7 +589,7 @@ bool PlacefileLines::RunMousePicking(
if (it != p->currentHoverLines_.crend())
{
itemPicked = true;
util::ImGui::Instance().DrawTooltip(it->di_->hoverText_);
util::tooltip::Show(it->di_->hoverText_, mouseGlobalPos);
}
return itemPicked;

6
scwx-qt/source/scwx/qt/gl/draw/placefile_text.cpp
View file

@ -1,6 +1,6 @@
#include <scwx/qt/gl/draw/placefile_text.hpp>
#include <scwx/qt/util/imgui.hpp>
#include <scwx/qt/util/maplibre.hpp>
#include <scwx/qt/util/tooltip.hpp>
#include <scwx/util/logger.hpp>
#include <fmt/format.h>
@ -210,7 +210,7 @@ void PlacefileText::Deinitialize()
bool PlacefileText::RunMousePicking(
const QMapLibreGL::CustomLayerRenderParameters& /* params */,
const QPointF& /* mouseLocalPos */,
const QPointF& /* mouseGlobalPos */,
const QPointF& mouseGlobalPos,
const glm::vec2& /* mouseCoords */)
{
bool itemPicked = false;
@ -219,7 +219,7 @@ bool PlacefileText::RunMousePicking(
if (!p->hoverText_.empty())
{
itemPicked = true;
util::ImGui::Instance().DrawTooltip(p->hoverText_);
util::tooltip::Show(p->hoverText_, mouseGlobalPos);
}
return itemPicked;