Showing the changes to interface/src/Application.cpp (1 of 3 files). Show all
Unified · Split
| @@ -164,7 +164,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 163 unmodified lines | |||
| 164 | _bytesPerSecond(0), | 164 | _bytesPerSecond(0), |
| 165 | _previousScriptLocation(), | 165 | _previousScriptLocation(), |
| 166 | _logger(new FileLogger(this)), | 166 | _logger(new FileLogger(this)), |
| 167 | _runningScriptsWidget(new RunningScriptsWidget), | 167 | _runningScriptsWidget(new RunningScriptsWidget(_window)), |
| 168 | _runningScriptsWidgetWasVisible(false) | 168 | _runningScriptsWidgetWasVisible(false) |
| 169 | { | 169 | { |
| 170 | // init GnuTLS for DTLS with domain-servers | 170 | // init GnuTLS for DTLS with domain-servers |
| @@ -332,7 +332,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 161 unmodified lines | |||
| 332 | LocalVoxelsList::getInstance()->addPersistantTree(DOMAIN_TREE_NAME, _voxels.getTree()); | 332 | LocalVoxelsList::getInstance()->addPersistantTree(DOMAIN_TREE_NAME, _voxels.getTree()); |
| 333 | LocalVoxelsList::getInstance()->addPersistantTree(CLIPBOARD_TREE_NAME, &_clipboard); | 333 | LocalVoxelsList::getInstance()->addPersistantTree(CLIPBOARD_TREE_NAME, &_clipboard); |
| 334 | 334 | ||
| 335 | _window->addDockWidget(Qt::NoDockWidgetArea, _runningScriptsWidget); | ||
| 336 | _runningScriptsWidget->setRunningScripts(getRunningScripts()); | 335 | _runningScriptsWidget->setRunningScripts(getRunningScripts()); |
| 337 | connect(_runningScriptsWidget, &RunningScriptsWidget::stopScriptName, this, &Application::stopScript); | 336 | connect(_runningScriptsWidget, &RunningScriptsWidget::stopScriptName, this, &Application::stopScript); |
| 338 | 337 | ||
| @@ -356,7 +355,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 17 unmodified lines | |||
| 356 | 355 | ||
| 357 | connect(_window, &MainWindow::windowGeometryChanged, | 356 | connect(_window, &MainWindow::windowGeometryChanged, |
| 358 | _runningScriptsWidget, &RunningScriptsWidget::setBoundary); | 357 | _runningScriptsWidget, &RunningScriptsWidget::setBoundary); |
| 359 | connect(_window, &MainWindow::windowShown, this, &Application::manageRunningScriptsWidgetVisibility); | ||
| 360 | 358 | ||
| 361 | //When -url in command line, teleport to location | 359 | //When -url in command line, teleport to location |
| 362 | urlGoTo(argc, constArgv); | 360 | urlGoTo(argc, constArgv); |
| @@ -705,11 +703,6 @@ void Application::resizeGL(int width, int height) { · 342 unmodified lines | |||
| 705 | updateProjectionMatrix(); | 703 | updateProjectionMatrix(); |
| 706 | glLoadIdentity(); | 704 | glLoadIdentity(); |
| 707 | 705 | ||
| 708 | if (_runningScriptsWidgetWasVisible) { | ||
| 709 | _runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(), | ||
| 710 | _window->geometry().topLeft().y(), | ||
| 711 | _runningScriptsWidget->width(), _window->height()); | ||
| 712 | } | ||
| 713 | // update Stats width | 706 | // update Stats width |
| 714 | int horizontalOffset = 0; | 707 | int horizontalOffset = 0; |
| 715 | if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { | 708 | if (Menu::getInstance()->isOptionChecked(MenuOption::Mirror)) { |
| @@ -3350,15 +3343,13 @@ void Application::manageRunningScriptsWidgetVisibility(bool shown) · 2634 unmodified lines | |||
| 3350 | 3343 | ||
| 3351 | void Application::toggleRunningScriptsWidget() | 3344 | void Application::toggleRunningScriptsWidget() |
| 3352 | { | 3345 | { |
| 3346 | qDebug() << "RS"; | ||
| 3353 | if (_runningScriptsWidgetWasVisible) { | 3347 | if (_runningScriptsWidgetWasVisible) { |
| 3354 | _runningScriptsWidget->hide(); | 3348 | _runningScriptsWidget->hide(); |
| 3355 | _runningScriptsWidgetWasVisible = false; | 3349 | _runningScriptsWidgetWasVisible = false; |
| 3356 | } else { | 3350 | } else { |
| 3357 | _runningScriptsWidget->setBoundary(QRect(_window->geometry().topLeft(), | 3351 | _runningScriptsWidget->setBoundary(QRect(_window->geometry().topLeft(), |
| 3358 | _window->size())); | 3352 | _window->size())); |
| 3359 | _runningScriptsWidget->setGeometry(_window->geometry().topLeft().x(), | ||
| 3360 | _window->geometry().topLeft().y(), | ||
| 3361 | _runningScriptsWidget->width(), _window->height()); | ||
| 3362 | _runningScriptsWidget->show(); | 3353 | _runningScriptsWidget->show(); |
| 3363 | _runningScriptsWidgetWasVisible = true; | 3354 | _runningScriptsWidgetWasVisible = true; |
| 3364 | } | 3355 | } |