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

Fix merge conflict during rebasing of rework_layer_text

Browse source
This commit is contained in:
AdenKoperczak 2025-03-03 10:24:41 -05:00
parent c139b156ee
commit ab682567c6
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
scwx-qt/source/scwx/qt/map/map_context.cpp
View file

@ -111,19 +111,11 @@ int16_t MapContext::radar_product_code() const
return p->radarProductCode_; return p->radarProductCode_;
} }
<<<<<<< HEAD
=======
QMapLibre::CustomLayerRenderParameters MapContext::render_parameters() const
{
return p->renderParameters_;
}
QWidget* MapContext::widget() const QWidget* MapContext::widget() const
{ {
return p->widget_; return p->widget_;
} }
>>>>>>> 513a41d3 (Inital code for per map layer ImGui contexts)
void MapContext::set_map(const std::shared_ptr<QMapLibre::Map>& map) void MapContext::set_map(const std::shared_ptr<QMapLibre::Map>& map)
{ {
p->map_ = map; p->map_ = map;