From 1709060a73f641b45fd42afd491854b820f9570a Mon Sep 17 00:00:00 2001 From: Trial97 Date: Fri, 31 May 2024 19:45:36 +0300 Subject: [PATCH] add more dialogs as fullscreen when in gamescope Signed-off-by: Trial97 --- launcher/ui/InstanceWindow.cpp | 4 ++++ launcher/ui/dialogs/ExportInstanceDialog.cpp | 6 ++++++ launcher/ui/dialogs/ExportPackDialog.cpp | 7 +++++++ launcher/ui/dialogs/ExportToModListDialog.cpp | 5 +++++ launcher/ui/dialogs/NewsDialog.cpp | 5 +++++ launcher/ui/pages/instance/InstanceSettingsPage.cpp | 4 ---- 6 files changed, 27 insertions(+), 4 deletions(-) diff --git a/launcher/ui/InstanceWindow.cpp b/launcher/ui/InstanceWindow.cpp index 2c49cb26c..6ba6dcf37 100644 --- a/launcher/ui/InstanceWindow.cpp +++ b/launcher/ui/InstanceWindow.cpp @@ -68,6 +68,10 @@ InstanceWindow::InstanceWindow(InstancePtr instance, QWidget* parent) : QMainWin { auto provider = std::make_shared(m_instance); m_container = new PageContainer(provider.get(), "console", this); + if (DesktopServices::isGameScope()) { + m_container->showFullScreen(); + m_container->setFixedSize(this->width(), this->height()); + } m_container->setParentContainer(this); setCentralWidget(m_container); setContentsMargins(0, 0, 0, 0); diff --git a/launcher/ui/dialogs/ExportInstanceDialog.cpp b/launcher/ui/dialogs/ExportInstanceDialog.cpp index 8d98b0513..481c4ac91 100644 --- a/launcher/ui/dialogs/ExportInstanceDialog.cpp +++ b/launcher/ui/dialogs/ExportInstanceDialog.cpp @@ -41,6 +41,7 @@ #include #include #include +#include "DesktopServices.h" #include "FileIgnoreProxy.h" #include "QObjectPtr.h" #include "ui/dialogs/CustomMessageBox.h" @@ -89,6 +90,11 @@ ExportInstanceDialog::ExportInstanceDialog(InstancePtr instance, QWidget* parent m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel")); m_ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK")); + + if (DesktopServices::isGameScope()) { + showFullScreen(); + setFixedSize(this->width(), this->height()); + } } ExportInstanceDialog::~ExportInstanceDialog() diff --git a/launcher/ui/dialogs/ExportPackDialog.cpp b/launcher/ui/dialogs/ExportPackDialog.cpp index e6c17972d..a87120234 100644 --- a/launcher/ui/dialogs/ExportPackDialog.cpp +++ b/launcher/ui/dialogs/ExportPackDialog.cpp @@ -17,6 +17,8 @@ */ #include "ExportPackDialog.h" +#include "DesktopServices.h" +#include "minecraft/mod/ModFolderModel.h" #include "minecraft/mod/ResourceFolderModel.h" #include "modplatform/ModIndex.h" #include "modplatform/flame/FlamePackExportTask.h" @@ -121,6 +123,11 @@ ExportPackDialog::ExportPackDialog(MinecraftInstancePtr instance, QWidget* paren m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel")); m_ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("OK")); + + if (DesktopServices::isGameScope()) { + showFullScreen(); + setFixedSize(this->width(), this->height()); + } } ExportPackDialog::~ExportPackDialog() diff --git a/launcher/ui/dialogs/ExportToModListDialog.cpp b/launcher/ui/dialogs/ExportToModListDialog.cpp index e8873f9b4..9db72b397 100644 --- a/launcher/ui/dialogs/ExportToModListDialog.cpp +++ b/launcher/ui/dialogs/ExportToModListDialog.cpp @@ -20,6 +20,7 @@ #include #include #include +#include "DesktopServices.h" #include "FileSystem.h" #include "Markdown.h" #include "StringUtils.h" @@ -68,6 +69,10 @@ ExportToModListDialog::ExportToModListDialog(QString name, QList mods, QWi ui->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel")); ui->buttonBox->button(QDialogButtonBox::Save)->setText(tr("Save")); triggerImp(); + if (DesktopServices::isGameScope()) { + showFullScreen(); + setFixedSize(this->width(), this->height()); + } } ExportToModListDialog::~ExportToModListDialog() diff --git a/launcher/ui/dialogs/NewsDialog.cpp b/launcher/ui/dialogs/NewsDialog.cpp index b646e3918..d38a53cb7 100644 --- a/launcher/ui/dialogs/NewsDialog.cpp +++ b/launcher/ui/dialogs/NewsDialog.cpp @@ -1,4 +1,5 @@ #include "NewsDialog.h" +#include "DesktopServices.h" #include "ui_NewsDialog.h" NewsDialog::NewsDialog(QList entries, QWidget* parent) : QDialog(parent), ui(new Ui::NewsDialog()) @@ -23,6 +24,10 @@ NewsDialog::NewsDialog(QList entries, QWidget* parent) : QDialog(p ui->currentArticleContentBrowser->setText(article_entry->content); ui->currentArticleContentBrowser->flush(); + if (DesktopServices::isGameScope()) { + showFullScreen(); + setFixedSize(this->width(), this->height()); + } } NewsDialog::~NewsDialog() diff --git a/launcher/ui/pages/instance/InstanceSettingsPage.cpp b/launcher/ui/pages/instance/InstanceSettingsPage.cpp index f619aca8c..f5deed5fa 100644 --- a/launcher/ui/pages/instance/InstanceSettingsPage.cpp +++ b/launcher/ui/pages/instance/InstanceSettingsPage.cpp @@ -98,10 +98,6 @@ InstanceSettingsPage::InstanceSettingsPage(BaseInstance* inst, QWidget* parent) loadSettings(); updateThresholds(); - if (DesktopServices::isGameScope()) { - showFullScreen(); - setFixedSize(this->width(), this->height()); - } } InstanceSettingsPage::~InstanceSettingsPage()