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

fix crash when selecting radar site with new ImGui contexts

Browse source
This commit is contained in:
AdenKoperczak 2025-01-06 08:57:55 -05:00
parent 6d107f6c2d
commit 9bd5af03f9
3 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
scwx-qt/source/scwx/qt/map/draw_layer.cpp
View file

@ -161,8 +161,12 @@ void DrawLayer::RenderWithoutImGui(
p->textureAtlasBuildCount_ = newTextureAtlasBuildCount; p->textureAtlasBuildCount_ = newTextureAtlasBuildCount;
} }
void DrawLayer::ImGuiSelectContext()
{
ImGui::SetCurrentContext(p->imGuiContext_);
}
void DrawLayer::Render(const QMapLibre::CustomLayerRenderParameters& params) void DrawLayer::Render(const QMapLibre::CustomLayerRenderParameters& params)
{ {
StartImGuiFrame(); StartImGuiFrame();
RenderWithoutImGui(params); RenderWithoutImGui(params);

1
scwx-qt/source/scwx/qt/map/draw_layer.hpp
View file

@ -37,6 +37,7 @@ protected:
void ImGuiInitialize(); void ImGuiInitialize();
void void
RenderWithoutImGui(const QMapLibre::CustomLayerRenderParameters& params); RenderWithoutImGui(const QMapLibre::CustomLayerRenderParameters& params);
void ImGuiSelectContext();
private: private:
std::unique_ptr<DrawLayerImpl> p; std::unique_ptr<DrawLayerImpl> p;

1
scwx-qt/source/scwx/qt/map/radar_site_layer.cpp
View file

@ -140,6 +140,7 @@ void RadarSiteLayer::Impl::RenderRadarSite(
if (ImGui::Button(radarSite->id().c_str())) if (ImGui::Button(radarSite->id().c_str()))
{ {
Q_EMIT self_->RadarSiteSelected(radarSite->id()); Q_EMIT self_->RadarSiteSelected(radarSite->id());
self_->ImGuiSelectContext();
} }
// Store hover text for mouse picking pass // Store hover text for mouse picking pass