From 0803a93f15e7430141d0f765cb94cefdf7cb5e03 Mon Sep 17 00:00:00 2001 From: Dan Paulat Date: Sun, 14 Jan 2024 00:09:23 -0600 Subject: [PATCH] Compass icon updates for Linux --- scwx-qt/source/scwx/qt/map/overlay_layer.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp index 3bbe0929..8b18688f 100644 --- a/scwx-qt/source/scwx/qt/map/overlay_layer.cpp +++ b/scwx-qt/source/scwx/qt/map/overlay_layer.cpp @@ -42,12 +42,7 @@ public: activeBoxOuter_ {std::make_shared(context)}, activeBoxInner_ {std::make_shared(context)}, geoIcons_ {std::make_shared(context)}, - icons_ {std::make_shared(context)}, - cardinalPointIconName_ { - types::GetTextureName(types::ImageTexture::CardinalPoint24)}, - compassIconName_ {types::GetTextureName(types::ImageTexture::Compass24)}, - locationIconName_ { - types::GetTextureName(types::ImageTexture::Crosshairs24)} + icons_ {std::make_shared(context)} { } ~OverlayLayerImpl() = default; @@ -61,11 +56,14 @@ public: std::shared_ptr geoIcons_; std::shared_ptr icons_; - const std::string& locationIconName_; + const std::string& locationIconName_ { + types::GetTextureName(types::ImageTexture::Crosshairs24)}; std::shared_ptr locationIcon_ {}; - const std::string& cardinalPointIconName_; - const std::string& compassIconName_; + const std::string& cardinalPointIconName_ { + types::GetTextureName(types::ImageTexture::CardinalPoint24)}; + const std::string& compassIconName_ { + types::GetTextureName(types::ImageTexture::Compass24)}; std::shared_ptr compassIcon_ {}; bool compassIconDirty_ {false}; double lastBearing_ {0.0}; @@ -174,6 +172,9 @@ void OverlayLayer::Initialize() } break; } + + default: + break; } }); p->icons_->FinishIcons();