Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 16:14:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

change display plugin to deactivate when window minimized

Browse source
This commit is contained in:
Triplelexx 2017-04-07 06:49:28 +01:00
parent 1b2887d5b1
commit 279997d905
4 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
interface/src/Application.cpp
View file

@ -1429,6 +1429,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
entityPacketSender->setMyAvatar(myAvatar.get()); entityPacketSender->setMyAvatar(myAvatar.get());
connect(this, &Application::applicationStateChanged, this, &Application::activeChanged); connect(this, &Application::applicationStateChanged, this, &Application::activeChanged);
connect(_window, SIGNAL(windowMinimizedChanged(bool)), this, SLOT(windowMinimizedChanged(bool)));
qCDebug(interfaceapp, "Startup time: %4.2f seconds.", (double)startupTimer.elapsed() / 1000.0); qCDebug(interfaceapp, "Startup time: %4.2f seconds.", (double)startupTimer.elapsed() / 1000.0);
auto textureCache = DependencyManager::get<TextureCache>(); auto textureCache = DependencyManager::get<TextureCache>();
@ -6476,6 +6477,15 @@ void Application::activeChanged(Qt::ApplicationState state) {
} }
} }
void Application::windowMinimizedChanged(bool minimized) {
if (!minimized && !getActiveDisplayPlugin()->isActive()) {
getActiveDisplayPlugin()->activate();
} else if (minimized && getActiveDisplayPlugin()->isActive()) {
getActiveDisplayPlugin()->deactivate();
}
}
void Application::postLambdaEvent(std::function<void()> f) { void Application::postLambdaEvent(std::function<void()> f) {
if (this->thread() == QThread::currentThread()) { if (this->thread() == QThread::currentThread()) {
f(); f();

1
interface/src/Application.h
View file

@ -416,6 +416,7 @@ private slots:
void faceTrackerMuteToggled(); void faceTrackerMuteToggled();
void activeChanged(Qt::ApplicationState state); void activeChanged(Qt::ApplicationState state);
void windowMinimizedChanged(bool minimized);
void notifyPacketVersionMismatch(); void notifyPacketVersionMismatch();

5
libraries/ui/src/MainWindow.cpp
View file

@ -105,12 +105,17 @@ void MainWindow::hideEvent(QHideEvent* event) {
void MainWindow::changeEvent(QEvent* event) { void MainWindow::changeEvent(QEvent* event) {
if (event->type() == QEvent::WindowStateChange) { if (event->type() == QEvent::WindowStateChange) {
QWindowStateChangeEvent* stateChangeEvent = static_cast<QWindowStateChangeEvent*>(event); QWindowStateChangeEvent* stateChangeEvent = static_cast<QWindowStateChangeEvent*>(event);
if ((stateChangeEvent->oldState() == Qt::WindowNoState || if ((stateChangeEvent->oldState() == Qt::WindowNoState ||
stateChangeEvent->oldState() == Qt::WindowMaximized) && stateChangeEvent->oldState() == Qt::WindowMaximized) &&
windowState() == Qt::WindowMinimized) { windowState() == Qt::WindowMinimized) {
emit windowShown(false); emit windowShown(false);
emit windowMinimizedChanged(true);
} else { } else {
emit windowShown(true); emit windowShown(true);
if (stateChangeEvent->oldState() == Qt::WindowMinimized) {
emit windowMinimizedChanged(false);
}
} }
} else if (event->type() == QEvent::ActivationChange) { } else if (event->type() == QEvent::ActivationChange) {
if (isActiveWindow()) { if (isActiveWindow()) {

1
libraries/ui/src/MainWindow.h
View file

@ -29,6 +29,7 @@ public slots:
signals: signals:
void windowGeometryChanged(QRect geometry); void windowGeometryChanged(QRect geometry);
void windowShown(bool shown); void windowShown(bool shown);
void windowMinimizedChanged(bool minimized);
protected: protected:
virtual void closeEvent(QCloseEvent* event) override; virtual void closeEvent(QCloseEvent* event) override;