History

Fix goTo* dialog bug with chat on Mac OSX

If chat was open, when pressing enter on Mac OSX the operation would not go through and would focus on the chat window. There seems to be a deeper issue, but it was decided to go with the simple solution of making these dialog windows not of `Sheet` type.

Ryan Huffman committed 12 years ago

Commit df6bbd21 parent 3acbaa71 file · +0 −4Browse files

Showing the changes to interface/src/Menu.cpp (1 of 1 file). Show all

Unified · Split

interface/src/Menu.cpp+0−4
@@ -1000,7 +1000,6 @@ void Menu::goToDomainDialog() { · 999 unmodified lines
1000 domainDialog.setWindowTitle("Go to Domain");1000 domainDialog.setWindowTitle("Go to Domain");
1001 domainDialog.setLabelText("Domain server:");1001 domainDialog.setLabelText("Domain server:");
1002 domainDialog.setTextValue(currentDomainHostname);1002 domainDialog.setTextValue(currentDomainHostname);
1003 domainDialog.setWindowFlags(Qt::Sheet);
1004 domainDialog.resize(domainDialog.parentWidget()->size().width() * DIALOG_RATIO_OF_WINDOW, domainDialog.size().height());1003 domainDialog.resize(domainDialog.parentWidget()->size().width() * DIALOG_RATIO_OF_WINDOW, domainDialog.size().height());
1005 1004
1006 int dialogReturn = domainDialog.exec();1005 int dialogReturn = domainDialog.exec();
@@ -1038,7 +1037,6 @@ void Menu::goTo() { · 31 unmodified lines
1038 QString destination = QString();1037 QString destination = QString();
1039 1038
1040 gotoDialog.setTextValue(destination);1039 gotoDialog.setTextValue(destination);
1041 gotoDialog.setWindowFlags(Qt::Sheet);
1042 gotoDialog.resize(gotoDialog.parentWidget()->size().width() * DIALOG_RATIO_OF_WINDOW, gotoDialog.size().height());1040 gotoDialog.resize(gotoDialog.parentWidget()->size().width() * DIALOG_RATIO_OF_WINDOW, gotoDialog.size().height());
1043 1041
1044 int dialogReturn = gotoDialog.exec();1042 int dialogReturn = gotoDialog.exec();
@@ -1154,7 +1152,6 @@ void Menu::goToLocation() { · 109 unmodified lines
1154 coordinateDialog.setWindowTitle("Go to Location");1152 coordinateDialog.setWindowTitle("Go to Location");
1155 coordinateDialog.setLabelText("Coordinate as x,y,z:");1153 coordinateDialog.setLabelText("Coordinate as x,y,z:");
1156 coordinateDialog.setTextValue(currentLocation);1154 coordinateDialog.setTextValue(currentLocation);
1157 coordinateDialog.setWindowFlags(Qt::Sheet);
1158 coordinateDialog.resize(coordinateDialog.parentWidget()->size().width() * 0.30, coordinateDialog.size().height());1155 coordinateDialog.resize(coordinateDialog.parentWidget()->size().width() * 0.30, coordinateDialog.size().height());
1159 1156
1160 int dialogReturn = coordinateDialog.exec();1157 int dialogReturn = coordinateDialog.exec();
@@ -1208,7 +1205,6 @@ void Menu::nameLocation() { · 47 unmodified lines
1208 "(wherever you are standing and looking now) as you.\n\n"1205 "(wherever you are standing and looking now) as you.\n\n"
1209 "Location name:");1206 "Location name:");
1210 1207
1211 nameDialog.setWindowFlags(Qt::Sheet);
1212 nameDialog.resize((int) (nameDialog.parentWidget()->size().width() * 0.30), nameDialog.size().height());1208 nameDialog.resize((int) (nameDialog.parentWidget()->size().width() * 0.30), nameDialog.size().height());
1213 1209
1214 if (nameDialog.exec() == QDialog::Accepted) {1210 if (nameDialog.exec() == QDialog::Accepted) {