songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1441 from maxGimeno/Polyhedron_demo-Fix_menus_with_unity-GF 

Polyhedron_demo : Fix the menu bug with Unity
This commit is contained in:
Laurent Rineau 2016-09-13 18:18:30 +02:00 committed by GitHub
parent dec0b451d6 3f40a60395
commit c4ca7800d2
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Polyhedron/demo/Polyhedron/MainWindow.cpp
View File

@ -524,7 +524,10 @@ void MainWindow::setMenus(QString name, QString parentName, QAction* a )
if(a->property("added").toBool()) if(a->property("added").toBool())
hasAction = true; hasAction = true;
if(!hasAction) if(!hasAction)
{
ui->menuOperations->removeAction(a);
menu->addAction(a); menu->addAction(a);
}
a->setProperty("added", true); a->setProperty("added", true);
//If the parent menu already exists, don't create a new one. //If the parent menu already exists, don't create a new one.
if(menu_map.contains(parentName)) if(menu_map.contains(parentName))
@ -540,7 +543,6 @@ void MainWindow::setMenus(QString name, QString parentName, QAction* a )
menu_map[parentName] = parentMenu; menu_map[parentName] = parentMenu;
} }
parentMenu->addMenu(menu); parentMenu->addMenu(menu);
ui->menuOperations->removeAction(a);
} }
void MainWindow::load_plugin(QString fileName, bool blacklisted) void MainWindow::load_plugin(QString fileName, bool blacklisted)