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

Ignore recursive paint events

Browse source
This commit is contained in:
Dan Paulat 2024-05-01 22:40:16 -05:00
parent 3df6363211
commit b56c43197f
1 changed files with 13 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -217,6 +217,7 @@ public:
common::Level2Product selectedLevel2Product_; common::Level2Product selectedLevel2Product_;
bool hasMouse_ {false}; bool hasMouse_ {false};
bool isPainting_ {false};
bool lastItemPicked_ {false}; bool lastItemPicked_ {false};
QPointF lastPos_ {}; QPointF lastPos_ {};
QPointF lastGlobalPos_ {}; QPointF lastGlobalPos_ {};
@ -1225,6 +1226,14 @@ void MapWidgetImpl::AddLayer(const std::string& id,
bool MapWidget::event(QEvent* e) bool MapWidget::event(QEvent* e)
{ {
if (e->type() == QEvent::Type::Paint && p->isPainting_)
{
logger_->error("Recursive paint event ignored");
// Ignore recursive paint events
return true;
}
if (p->pickedEventHandler_ != nullptr && if (p->pickedEventHandler_ != nullptr &&
p->pickedEventHandler_->event_ != nullptr) p->pickedEventHandler_->event_ != nullptr)
{ {
@ -1379,6 +1388,8 @@ void MapWidget::initializeGL()
void MapWidget::paintGL() void MapWidget::paintGL()
{ {
p->isPainting_ = true;
auto defaultFont = manager::FontManager::Instance().GetImGuiFont( auto defaultFont = manager::FontManager::Instance().GetImGuiFont(
types::FontCategory::Default); types::FontCategory::Default);
@ -1437,6 +1448,8 @@ void MapWidget::paintGL()
// Paint complete // Paint complete
Q_EMIT WidgetPainted(); Q_EMIT WidgetPainted();
p->isPainting_ = false;
} }
void MapWidgetImpl::ImGuiCheckFonts() void MapWidgetImpl::ImGuiCheckFonts()