Tool window in QML
Showing the changes to interface/src/Application.cpp (1 of 37 files). Show all
Unified · Split
| @@ -395,7 +395,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 394 unmodified lines | |||
| 395 | QApplication(argc, argv), | 395 | QApplication(argc, argv), |
| 396 | _dependencyManagerIsSetup(setupEssentials(argc, argv)), | 396 | _dependencyManagerIsSetup(setupEssentials(argc, argv)), |
| 397 | _window(new MainWindow(desktop())), | 397 | _window(new MainWindow(desktop())), |
| 398 | _toolWindow(NULL), | ||
| 399 | _undoStackScriptingInterface(&_undoStack), | 398 | _undoStackScriptingInterface(&_undoStack), |
| 400 | _frameCount(0), | 399 | _frameCount(0), |
| 401 | _fps(60.0f), | 400 | _fps(60.0f), |
| @@ -678,10 +677,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) : · 276 unmodified lines | |||
| 678 | _renderEngine->addTask(make_shared<RenderDeferredTask>()); | 677 | _renderEngine->addTask(make_shared<RenderDeferredTask>()); |
| 679 | _renderEngine->registerScene(_main3DScene); | 678 | _renderEngine->registerScene(_main3DScene); |
| 680 | 679 | ||
| 681 | _toolWindow = new ToolWindow(); | ||
| 682 | _toolWindow->setWindowFlags((_toolWindow->windowFlags() | Qt::WindowStaysOnTopHint) & ~Qt::WindowMinimizeButtonHint); | ||
| 683 | _toolWindow->setWindowTitle("Tools"); | ||
| 684 | |||
| 685 | _offscreenContext->makeCurrent(); | 680 | _offscreenContext->makeCurrent(); |
| 686 | 681 | ||
| 687 | // Tell our entity edit sender about our known jurisdictions | 682 | // Tell our entity edit sender about our known jurisdictions |
| @@ -4766,7 +4761,7 @@ void Application::showFriendsWindow() { · 4078 unmodified lines | |||
| 4766 | auto webWindowClass = _window->findChildren<WebWindowClass>(FRIENDS_WINDOW_OBJECT_NAME); | 4761 | auto webWindowClass = _window->findChildren<WebWindowClass>(FRIENDS_WINDOW_OBJECT_NAME); |
| 4767 | if (webWindowClass.empty()) { | 4762 | if (webWindowClass.empty()) { |
| 4768 | auto friendsWindow = new WebWindowClass(FRIENDS_WINDOW_TITLE, FRIENDS_WINDOW_URL, FRIENDS_WINDOW_WIDTH, | 4763 | auto friendsWindow = new WebWindowClass(FRIENDS_WINDOW_TITLE, FRIENDS_WINDOW_URL, FRIENDS_WINDOW_WIDTH, |
| 4769 | FRIENDS_WINDOW_HEIGHT, false); | 4764 | FRIENDS_WINDOW_HEIGHT); |
| 4770 | friendsWindow->setParent(_window); | 4765 | friendsWindow->setParent(_window); |
| 4771 | friendsWindow->setObjectName(FRIENDS_WINDOW_OBJECT_NAME); | 4766 | friendsWindow->setObjectName(FRIENDS_WINDOW_OBJECT_NAME); |
| 4772 | connect(friendsWindow, &WebWindowClass::closed, &WebWindowClass::deleteLater); | 4767 | connect(friendsWindow, &WebWindowClass::closed, &WebWindowClass::deleteLater); |