Showing the changes to interface/src/Menu.cpp (1 of 70 files). Show all
Unified · Split
| @@ -250,12 +250,21 @@ Menu::Menu() : · 249 unmodified lines | ||
| 250 | 250 | |
| 251 | 251 | QMenu* viewMenu = addMenu("View"); |
| 252 | 252 | |
| 253 | +#ifdef Q_OS_MAC | |
| 253 | 254 | addCheckableActionToQMenuAndActionHash(viewMenu, |
| 254 | 255 | MenuOption::Fullscreen, |
| 255 | 256 | Qt::CTRL | Qt::META | Qt::Key_F, |
| 256 | 257 | false, |
| 257 | 258 | appInstance, |
| 258 | 259 | SLOT(setFullscreen(bool))); |
| 260 | +#else | |
| 261 | + addCheckableActionToQMenuAndActionHash(viewMenu, | |
| 262 | + MenuOption::Fullscreen, | |
| 263 | + Qt::CTRL | Qt::Key_F, | |
| 264 | + false, | |
| 265 | + appInstance, | |
| 266 | + SLOT(setFullscreen(bool))); | |
| 267 | +#endif | |
| 259 | 268 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::FirstPerson, Qt::Key_P, true, |
| 260 | 269 | appInstance,SLOT(cameraMenuChanged())); |
| 261 | 270 | addCheckableActionToQMenuAndActionHash(viewMenu, MenuOption::Mirror, Qt::SHIFT | Qt::Key_H, true); |
| @@ -1296,6 +1305,7 @@ void Menu::showChat() { · 1034 unmodified lines | ||
| 1296 | 1305 | if (_chatWindow->isHidden()) { |
| 1297 | 1306 | _chatWindow->show(); |
| 1298 | 1307 | } |
| 1308 | + _chatWindow->activateWindow(); | |
| 1299 | 1309 | } else { |
| 1300 | 1310 | Application::getInstance()->getTrayIcon()->showMessage("Interface", "You need to login to be able to chat with others on this domain."); |
| 1301 | 1311 | } |