Merge pull request #4728 from Morph1984/applets-on-top
main: Allow applets to display on top while fullscreen
This commit is contained in:
commit
a1e3f6e27b
|
@ -288,8 +288,8 @@ GMainWindow::~GMainWindow() {
|
||||||
void GMainWindow::ControllerSelectorReconfigureControllers(
|
void GMainWindow::ControllerSelectorReconfigureControllers(
|
||||||
const Core::Frontend::ControllerParameters& parameters) {
|
const Core::Frontend::ControllerParameters& parameters) {
|
||||||
QtControllerSelectorDialog dialog(this, parameters, input_subsystem.get());
|
QtControllerSelectorDialog dialog(this, parameters, input_subsystem.get());
|
||||||
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint |
|
||||||
Qt::WindowSystemMenuHint);
|
Qt::WindowTitleHint | Qt::WindowSystemMenuHint);
|
||||||
dialog.setWindowModality(Qt::WindowModal);
|
dialog.setWindowModality(Qt::WindowModal);
|
||||||
dialog.exec();
|
dialog.exec();
|
||||||
|
|
||||||
|
@ -307,8 +307,9 @@ void GMainWindow::ProfileSelectorSelectProfile() {
|
||||||
int index = 0;
|
int index = 0;
|
||||||
if (manager.GetUserCount() != 1) {
|
if (manager.GetUserCount() != 1) {
|
||||||
QtProfileSelectionDialog dialog(this);
|
QtProfileSelectionDialog dialog(this);
|
||||||
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint |
|
||||||
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
|
Qt::WindowTitleHint | Qt::WindowSystemMenuHint |
|
||||||
|
Qt::WindowCloseButtonHint);
|
||||||
dialog.setWindowModality(Qt::WindowModal);
|
dialog.setWindowModality(Qt::WindowModal);
|
||||||
|
|
||||||
if (dialog.exec() == QDialog::Rejected) {
|
if (dialog.exec() == QDialog::Rejected) {
|
||||||
|
@ -331,8 +332,9 @@ void GMainWindow::ProfileSelectorSelectProfile() {
|
||||||
void GMainWindow::SoftwareKeyboardGetText(
|
void GMainWindow::SoftwareKeyboardGetText(
|
||||||
const Core::Frontend::SoftwareKeyboardParameters& parameters) {
|
const Core::Frontend::SoftwareKeyboardParameters& parameters) {
|
||||||
QtSoftwareKeyboardDialog dialog(this, parameters);
|
QtSoftwareKeyboardDialog dialog(this, parameters);
|
||||||
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
|
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowStaysOnTopHint |
|
||||||
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
|
Qt::WindowTitleHint | Qt::WindowSystemMenuHint |
|
||||||
|
Qt::WindowCloseButtonHint);
|
||||||
dialog.setWindowModality(Qt::WindowModal);
|
dialog.setWindowModality(Qt::WindowModal);
|
||||||
|
|
||||||
if (dialog.exec() == QDialog::Rejected) {
|
if (dialog.exec() == QDialog::Rejected) {
|
||||||
|
|
Loading…
Reference in New Issue