Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix #505

This commit is contained in:
halx99 2021-09-23 14:53:57 +08:00
parent e83c8b1c08
commit 629625a976
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extensions/ImGuiEXT/CCImGuiEXT.cpp
View File

@ -30,13 +30,13 @@ public:
auto listener = EventListenerTouchOneByOne::create(); auto listener = EventListenerTouchOneByOne::create();
listener->setSwallowTouches(true); listener->setSwallowTouches(true);
listener->onTouchBegan = [this](Touch* touch, Event*) -> bool { listener->onTouchBegan = [this](Touch* touch, Event*) -> bool {
return ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow); return ImGui::GetIO().WantCaptureMouse;
}; };
_trackLayer->getEventDispatcher()->addEventListenerWithSceneGraphPriority(listener, _trackLayer); _trackLayer->getEventDispatcher()->addEventListenerWithSceneGraphPriority(listener, _trackLayer);
// add by halx99 // add by halx99
auto stopAnyMouse = [=](EventMouse* event) { auto stopAnyMouse = [=](EventMouse* event) {
if (ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow)) { if (ImGui::GetIO().WantCaptureMouse) {
event->stopPropagation(); event->stopPropagation();
} }
}; };
@ -92,13 +92,13 @@ public:
_touchListener = utils::newInstance<EventListenerTouchOneByOne>(); _touchListener = utils::newInstance<EventListenerTouchOneByOne>();
_touchListener->setSwallowTouches(true); _touchListener->setSwallowTouches(true);
_touchListener->onTouchBegan = [this](Touch* touch, Event*) -> bool { _touchListener->onTouchBegan = [this](Touch* touch, Event*) -> bool {
return ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow); return ImGui::GetIO().WantCaptureMouse;
}; };
eventDispatcher->addEventListenerWithFixedPriority(_touchListener, highestPriority); eventDispatcher->addEventListenerWithFixedPriority(_touchListener, highestPriority);
// add by halx99 // add by halx99
auto stopAnyMouse = [=](EventMouse* event) { auto stopAnyMouse = [=](EventMouse* event) {
if (ImGui::IsWindowHovered(ImGuiHoveredFlags_AnyWindow)) { if (ImGui::GetIO().WantCaptureMouse) {
event->stopPropagation(); event->stopPropagation();
} }
}; };