TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-14 16:14:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1365 from Olathuss/closeMenu

Browse source 
Close Menu Implemented
This commit is contained in:
Brian Roberts 2025-01-26 11:52:53 -06:00 • committed by GitHub
commit 4a0bb46b49
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Engine/source/gui/editor/guiMenuBar.cpp
View file

@ -506,6 +506,16 @@ void GuiMenuBar::onAction()
mouseDownMenu->popupMenu->showPopup(root, pos.x, pos.y); mouseDownMenu->popupMenu->showPopup(root, pos.x, pos.y);
} }
void GuiMenuBar::closeMenu()
{
if(mouseDownMenu)
mouseDownMenu->popupMenu->hidePopup();
mouseOverMenu = NULL;
mouseDownMenu = NULL;
mMouseInMenu = false;
}
// Process a tick // Process a tick
void GuiMenuBar::processTick() void GuiMenuBar::processTick()
{ {

4
Engine/source/gui/editor/guiPopupMenuCtrl.cpp
View file

@ -247,6 +247,10 @@ void GuiPopupMenuTextListCtrl::onMouseUp(const GuiEvent &event)
{ {
if (item->mEnabled) if (item->mEnabled)
{ {
if(mMenuBar)
{
mMenuBar->closeMenu();
}
Con::executef(mPopup, "onSelectItem", Con::getIntArg(getSelectedCell().y), item->mText.isNotEmpty() ? item->mText : String("")); Con::executef(mPopup, "onSelectItem", Con::getIntArg(getSelectedCell().y), item->mText.isNotEmpty() ? item->mText : String(""));
} }
} }