1
0
mirror of https://github.com/tumic0/GPXSee.git synced 2024-11-24 11:45:53 +01:00

Prevent broken Qt heuristics to put submenus on wrong places on Mac

This commit is contained in:
Martin Tůma 2023-11-17 13:41:01 +01:00
parent b1655c6348
commit f258ca1a3e

View File

@ -631,6 +631,7 @@ void GUI::createMenus()
_recentFilesMenu = fileMenu->addMenu(tr("Open recent")); _recentFilesMenu = fileMenu->addMenu(tr("Open recent"));
_recentFilesMenu->setIcon(QIcon::fromTheme(OPEN_RECENT_NAME, _recentFilesMenu->setIcon(QIcon::fromTheme(OPEN_RECENT_NAME,
QIcon(OPEN_RECENT_ICON))); QIcon(OPEN_RECENT_ICON)));
_recentFilesMenu->menuAction()->setMenuRole(QAction::NoRole);
_recentFilesMenu->setEnabled(false); _recentFilesMenu->setEnabled(false);
_recentFilesEnd = _recentFilesMenu->addSeparator(); _recentFilesEnd = _recentFilesMenu->addSeparator();
_recentFilesMenu->addAction(_clearRecentFilesAction); _recentFilesMenu->addAction(_clearRecentFilesAction);
@ -680,6 +681,7 @@ void GUI::createMenus()
dataMenu->addAction(_showRouteWaypointsAction); dataMenu->addAction(_showRouteWaypointsAction);
dataMenu->addAction(_showTicksAction); dataMenu->addAction(_showTicksAction);
QMenu *markerMenu = dataMenu->addMenu(tr("Position info")); QMenu *markerMenu = dataMenu->addMenu(tr("Position info"));
markerMenu->menuAction()->setMenuRole(QAction::NoRole);
markerMenu->addAction(_hideMarkersAction); markerMenu->addAction(_hideMarkersAction);
markerMenu->addAction(_showMarkersAction); markerMenu->addAction(_showMarkersAction);
markerMenu->addAction(_showMarkerDateAction); markerMenu->addAction(_showMarkerDateAction);
@ -717,13 +719,16 @@ void GUI::createMenus()
QMenu *settingsMenu = menuBar()->addMenu(tr("&Settings")); QMenu *settingsMenu = menuBar()->addMenu(tr("&Settings"));
QMenu *timeMenu = settingsMenu->addMenu(tr("Time")); QMenu *timeMenu = settingsMenu->addMenu(tr("Time"));
timeMenu->menuAction()->setMenuRole(QAction::NoRole);
timeMenu->addAction(_totalTimeAction); timeMenu->addAction(_totalTimeAction);
timeMenu->addAction(_movingTimeAction); timeMenu->addAction(_movingTimeAction);
QMenu *unitsMenu = settingsMenu->addMenu(tr("Units")); QMenu *unitsMenu = settingsMenu->addMenu(tr("Units"));
unitsMenu->menuAction()->setMenuRole(QAction::NoRole);
unitsMenu->addAction(_metricUnitsAction); unitsMenu->addAction(_metricUnitsAction);
unitsMenu->addAction(_imperialUnitsAction); unitsMenu->addAction(_imperialUnitsAction);
unitsMenu->addAction(_nauticalUnitsAction); unitsMenu->addAction(_nauticalUnitsAction);
QMenu *coordinatesMenu = settingsMenu->addMenu(tr("Coordinates format")); QMenu *coordinatesMenu = settingsMenu->addMenu(tr("Coordinates format"));
coordinatesMenu->menuAction()->setMenuRole(QAction::NoRole);
coordinatesMenu->addAction(_decimalDegreesAction); coordinatesMenu->addAction(_decimalDegreesAction);
coordinatesMenu->addAction(_degreesMinutesAction); coordinatesMenu->addAction(_degreesMinutesAction);
coordinatesMenu->addAction(_dmsAction); coordinatesMenu->addAction(_dmsAction);