Showing the changes to interface/src/Application.cpp (1 of 11 files). Show all
Unified · Split
| @@ -665,7 +665,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 664 unmodified lines | |||
| 665 | 665 | ||
| 666 | void Application::aboutToQuit() { | 666 | void Application::aboutToQuit() { |
| 667 | emit beforeAboutToQuit(); | 667 | emit beforeAboutToQuit(); |
| 668 | 668 | getActiveDisplayPlugin()->deactivate(this); | |
| 669 | _aboutToQuit = true; | 669 | _aboutToQuit = true; |
| 670 | cleanupBeforeQuit(); | 670 | cleanupBeforeQuit(); |
| 671 | } | 671 | } |
| @@ -743,8 +743,6 @@ Application::~Application() { · 71 unmodified lines | |||
| 743 | 743 | ||
| 744 | ModelEntityItem::cleanupLoadedAnimations(); | 744 | ModelEntityItem::cleanupLoadedAnimations(); |
| 745 | 745 | ||
| 746 | getActiveDisplayPlugin()->deactivate(this); | ||
| 747 | |||
| 748 | auto inputPlugins = getInputPlugins(); | 746 | auto inputPlugins = getInputPlugins(); |
| 749 | foreach(auto inputPlugin, inputPlugins) { | 747 | foreach(auto inputPlugin, inputPlugins) { |
| 750 | QString name = inputPlugin->getName(); | 748 | QString name = inputPlugin->getName(); |
| @@ -4685,6 +4683,10 @@ void Application::shutdownPlugins() { · 3934 unmodified lines | |||
| 4685 | } | 4683 | } |
| 4686 | 4684 | ||
| 4687 | glm::uvec2 Application::getCanvasSize() const { | 4685 | glm::uvec2 Application::getCanvasSize() const { |
| 4686 | return toGlm(_glWindow->size()); | ||
| 4687 | } | ||
| 4688 | |||
| 4689 | glm::uvec2 Application::getUiSize() const { | ||
| 4688 | return getActiveDisplayPlugin()->getRecommendedUiSize(); | 4690 | return getActiveDisplayPlugin()->getRecommendedUiSize(); |
| 4689 | } | 4691 | } |
| 4690 | 4692 | ||