Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 02:33:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3557 from birarda/master

Browse source 
fix for window modalities
This commit is contained in:
Clément Brisset 2014-10-08 11:53:48 -07:00
commit e4f5f11429
3 changed files with 1 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
interface/src/ui/AddressBarDialog.cpp
View file

@ -45,13 +45,6 @@ void AddressBarDialog::setupUI() {
const int DIALOG_HEIGHT = 62; const int DIALOG_HEIGHT = 62;
const int DIALOG_INITIAL_WIDTH = 560; const int DIALOG_INITIAL_WIDTH = 560;
setModal(true);
#ifndef Q_OS_MAC
setWindowModality(Qt::ApplicationModal);
#else
setWindowModality(Qt::WindowModal);
#endif
QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed); QSizePolicy sizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
setSizePolicy(sizePolicy); setSizePolicy(sizePolicy);
setMinimumSize(QSize(DIALOG_INITIAL_WIDTH, DIALOG_HEIGHT)); setMinimumSize(QSize(DIALOG_INITIAL_WIDTH, DIALOG_HEIGHT));

3
interface/src/ui/LoginDialog.cpp
View file

@ -35,9 +35,6 @@ LoginDialog::LoginDialog(QWidget* parent) :
_ui->infoLabel->setVisible(false); _ui->infoLabel->setVisible(false);
_ui->errorLabel->setVisible(false); _ui->errorLabel->setVisible(false);
setModal(true);
setWindowModality(Qt::ApplicationModal);
connect(&AccountManager::getInstance(), &AccountManager::loginComplete, connect(&AccountManager::getInstance(), &AccountManager::loginComplete,
this, &LoginDialog::handleLoginCompleted); this, &LoginDialog::handleLoginCompleted);
connect(&AccountManager::getInstance(), &AccountManager::loginFailed, connect(&AccountManager::getInstance(), &AccountManager::loginFailed,

2
interface/src/ui/MetavoxelEditor.cpp
View file

@ -48,7 +48,7 @@ enum GridPlane {
const glm::vec2 INVALID_VECTOR(FLT_MAX, FLT_MAX); const glm::vec2 INVALID_VECTOR(FLT_MAX, FLT_MAX);
MetavoxelEditor::MetavoxelEditor() : MetavoxelEditor::MetavoxelEditor() :
QWidget(Application::getInstance()->getGLWidget(), Qt::Tool | Qt::WindowStaysOnTopHint) { QWidget(Application::getInstance()->getGLWidget(), Qt::Tool) {
setWindowTitle("Metavoxel Editor"); setWindowTitle("Metavoxel Editor");
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);