Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-21 06:44:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

tweak to how activateWindow() is called after dialog boxes

Browse source
This commit is contained in:
ZappoMan 2013-08-26 14:24:42 -07:00
parent 943e1f9110
commit 0df11124b3
1 changed files with 15 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
interface/src/Menu.cpp
View file

@ -680,11 +680,11 @@ void Menu::editPreferences() {
dialog.connect(buttons, SIGNAL(rejected()), SLOT(reject()));
layout->addWidget(buttons);
if (dialog.exec() != QDialog::Accepted) {
// restore the main window's active state
applicationInstance->getWindow()->activateWindow();
return;
}
int ret = dialog.exec();
applicationInstance->getWindow()->activateWindow();
if (ret != QDialog::Accepted) {
return;
}
QByteArray newHostname;
@ -727,9 +727,6 @@ void Menu::editPreferences() {
_fieldOfView = fieldOfView->value();
applicationInstance->resizeGL(applicationInstance->getGLWidget()->width(), applicationInstance->getGLWidget()->height());
// restore the main window's active state
applicationInstance->getWindow()->activateWindow();
}
void Menu::goToDomain() {
@ -753,11 +750,11 @@ void Menu::goToDomain() {
dialog.connect(buttons, SIGNAL(rejected()), SLOT(reject()));
layout->addWidget(buttons);
if (dialog.exec() != QDialog::Accepted) {
// restore the main window's active state
applicationInstance->getWindow()->activateWindow();
return;
}
int ret = dialog.exec();
applicationInstance->getWindow()->activateWindow();
if (ret != QDialog::Accepted) {
return;
}
QByteArray newHostname;
@ -783,8 +780,6 @@ void Menu::goToDomain() {
// set the new hostname
NodeList::getInstance()->setDomainHostname(newHostname.constData());
}
// restore the main window's active state
applicationInstance->getWindow()->activateWindow();
}
void Menu::goToLocation() {
@ -814,11 +809,11 @@ void Menu::goToLocation() {
dialog.connect(buttons, SIGNAL(rejected()), SLOT(reject()));
layout->addWidget(buttons);
if (dialog.exec() != QDialog::Accepted) {
// restore the main window's active state
appInstance->getWindow()->activateWindow();
return;
}
int ret = dialog.exec();
applicationInstance->getWindow()->activateWindow();
if (ret != QDialog::Accepted) {
return;
}
QByteArray newCoordinates;
@ -844,8 +839,6 @@ void Menu::goToLocation() {
}
}
}
// restore the main window's active state
appInstance->getWindow()->activateWindow();
}