Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 15:30:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1157 from birarda/assignment

Browse source 
finally fix the dialog mouselook bug
This commit is contained in:
ZappoMan 2013-10-31 12:09:27 -07:00
commit 70dfd55ceb
1 changed files with 7 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
interface/src/Menu.cpp
View file

@ -745,7 +745,7 @@ QLineEdit* lineEditForDomainHostname() {
void Menu::login() { void Menu::login() {
Application* applicationInstance = Application::getInstance(); Application* applicationInstance = Application::getInstance();
QDialog dialog(applicationInstance->getGLWidget()); QDialog dialog;
dialog.setWindowTitle("Login"); dialog.setWindowTitle("Login");
QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom); QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom);
dialog.setLayout(layout); dialog.setLayout(layout);
@ -764,7 +764,6 @@ void Menu::login() {
layout->addWidget(buttons); layout->addWidget(buttons);
int ret = dialog.exec(); int ret = dialog.exec();
applicationInstance->getWindow()->activateWindow();
if (ret != QDialog::Accepted) { if (ret != QDialog::Accepted) {
return; return;
} }
@ -779,7 +778,7 @@ void Menu::login() {
void Menu::editPreferences() { void Menu::editPreferences() {
Application* applicationInstance = Application::getInstance(); Application* applicationInstance = Application::getInstance();
QDialog dialog(applicationInstance->getGLWidget()); QDialog dialog;
dialog.setWindowTitle("Interface Preferences"); dialog.setWindowTitle("Interface Preferences");
QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom); QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom);
dialog.setLayout(layout); dialog.setLayout(layout);
@ -837,7 +836,6 @@ void Menu::editPreferences() {
layout->addWidget(buttons); layout->addWidget(buttons);
int ret = dialog.exec(); int ret = dialog.exec();
applicationInstance->getWindow()->activateWindow();
if (ret != QDialog::Accepted) { if (ret != QDialog::Accepted) {
return; return;
} }
@ -887,8 +885,7 @@ void Menu::editPreferences() {
} }
void Menu::goToDomain() { void Menu::goToDomain() {
Application* applicationInstance = Application::getInstance(); QDialog dialog;
QDialog dialog(applicationInstance->getGLWidget());
dialog.setWindowTitle("Go To Domain"); dialog.setWindowTitle("Go To Domain");
QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom); QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom);
dialog.setLayout(layout); dialog.setLayout(layout);
@ -906,7 +903,6 @@ void Menu::goToDomain() {
layout->addWidget(buttons); layout->addWidget(buttons);
int ret = dialog.exec(); int ret = dialog.exec();
applicationInstance->getWindow()->activateWindow();
if (ret != QDialog::Accepted) { if (ret != QDialog::Accepted) {
return; return;
} }
@ -915,8 +911,7 @@ void Menu::goToDomain() {
} }
void Menu::goToLocation() { void Menu::goToLocation() {
Application* applicationInstance = Application::getInstance(); QDialog dialog;
QDialog dialog(applicationInstance->getGLWidget());
dialog.setWindowTitle("Go To Location"); dialog.setWindowTitle("Go To Location");
QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom); QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom);
dialog.setLayout(layout); dialog.setLayout(layout);
@ -926,8 +921,8 @@ void Menu::goToLocation() {
const int QLINE_MINIMUM_WIDTH = 300; const int QLINE_MINIMUM_WIDTH = 300;
Application* appInstance = Application::getInstance(); Application* applicationInstance = Application::getInstance();
MyAvatar* myAvatar = appInstance->getAvatar(); MyAvatar* myAvatar = applicationInstance->getAvatar();
glm::vec3 avatarPos = myAvatar->getPosition(); glm::vec3 avatarPos = myAvatar->getPosition();
QString currentLocation = QString("%1, %2, %3").arg(QString::number(avatarPos.x), QString currentLocation = QString("%1, %2, %3").arg(QString::number(avatarPos.x),
QString::number(avatarPos.y), QString::number(avatarPos.z)); QString::number(avatarPos.y), QString::number(avatarPos.z));
@ -942,7 +937,6 @@ void Menu::goToLocation() {
layout->addWidget(buttons); layout->addWidget(buttons);
int ret = dialog.exec(); int ret = dialog.exec();
applicationInstance->getWindow()->activateWindow();
if (ret != QDialog::Accepted) { if (ret != QDialog::Accepted) {
return; return;
} }
@ -974,8 +968,7 @@ void Menu::goToLocation() {
} }
void Menu::goToUser() { void Menu::goToUser() {
Application* applicationInstance = Application::getInstance(); QDialog dialog;
QDialog dialog(applicationInstance->getGLWidget());
dialog.setWindowTitle("Go To User"); dialog.setWindowTitle("Go To User");
QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom); QBoxLayout* layout = new QBoxLayout(QBoxLayout::TopToBottom);
dialog.setLayout(layout); dialog.setLayout(layout);
@ -993,7 +986,6 @@ void Menu::goToUser() {
layout->addWidget(buttons); layout->addWidget(buttons);
int ret = dialog.exec(); int ret = dialog.exec();
applicationInstance->getWindow()->activateWindow();
if (ret != QDialog::Accepted) { if (ret != QDialog::Accepted) {
return; return;
} }