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

Merge branch 'develop' into feature/radar-smoothing

Browse source
This commit is contained in:
Dan Paulat 2024-12-03 23:30:06 -06:00
commit b93c76ef1b
7 changed files with 44 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
scwx-qt/source/scwx/qt/map/map_widget.cpp
View file

@ -1039,11 +1039,14 @@ void MapWidget::UpdateMouseCoordinate(const common::Coordinate& coordinate)
{
if (p->context_->mouse_coordinate() != coordinate)
{
auto& generalSettings = settings::GeneralSettings::Instance();
p->context_->set_mouse_coordinate(coordinate);
auto keyboardModifiers = QGuiApplication::keyboardModifiers();
if (keyboardModifiers != Qt::KeyboardModifier::NoModifier ||
if (generalSettings.cursor_icon_always_on().GetValue() ||
keyboardModifiers != Qt::KeyboardModifier::NoModifier ||
keyboardModifiers != p->lastKeyboardModifiers_)
{
QMetaObject::invokeMethod(

10
scwx-qt/source/scwx/qt/map/overlay_layer.cpp
View file

@ -328,9 +328,13 @@ void OverlayLayer::Render(const QMapLibre::CustomLayerRenderParameters& params)
p->activeBoxInner_->SetBorder(1.0f * pixelRatio, {255, 255, 255, 255});
}
auto& generalSettings = settings::GeneralSettings::Instance();
// Cursor Icon
bool cursorIconVisible = QGuiApplication::keyboardModifiers() &
Qt::KeyboardModifier::ControlModifier;
bool cursorIconVisible =
generalSettings.cursor_icon_always_on().GetValue() ||
(QGuiApplication::keyboardModifiers() &
Qt::KeyboardModifier::ControlModifier);
p->geoIcons_->SetIconVisible(p->cursorIcon_, cursorIconVisible);
if (cursorIconVisible)
{
@ -434,8 +438,6 @@ void OverlayLayer::Render(const QMapLibre::CustomLayerRenderParameters& params)
ImGui::End();
}
auto& generalSettings = settings::GeneralSettings::Instance();
// Map Center Icon
if (params.width != p->lastWidth_ || params.height != p->lastHeight_)
{