ONIMAI-SMP/ShatteredPrism
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

fix bug with buton not updating corectly for java dialog

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2024-08-22 18:59:09 +03:00
parent 7d9e47ac18
commit 0b05c7cb07
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
launcher/ui/java/InstallJavaDialog.cpp
View File

@ -259,14 +259,14 @@ InstallDialog::InstallDialog(const QString& uid, BaseInstance* instance, QWidget
auto cast = pageCast(page); auto cast = pageCast(page);
cast->setRecomend(true); cast->setRecomend(true);
connect(cast, &InstallJavaPage::selectionChanged, this, [this] { validate(); }); connect(cast, &InstallJavaPage::selectionChanged, this, [this, cast] { validate(cast); });
if (!recommendedJavas.isEmpty()) { if (!recommendedJavas.isEmpty()) {
cast->setRecommendedMajors(recommendedJavas); cast->setRecommendedMajors(recommendedJavas);
} }
} }
connect(container, &PageContainer::selectedPageChanged, this, [this] { validate(); }); connect(container, &PageContainer::selectedPageChanged, this, [this](BasePage* previous, BasePage* selected) { validate(selected); });
pageCast(container->selectedPage())->selectSearch(); pageCast(container->selectedPage())->selectSearch();
validate(); validate(container->selectedPage());
} }
QList<BasePage*> InstallDialog::getPages() QList<BasePage*> InstallDialog::getPages()
@ -286,10 +286,9 @@ QString InstallDialog::dialogTitle()
return tr("Install Java"); return tr("Install Java");
} }
void InstallDialog::validate() void InstallDialog::validate(BasePage* selected)
{ {
buttons->button(QDialogButtonBox::Ok) buttons->button(QDialogButtonBox::Ok)->setEnabled(!!std::dynamic_pointer_cast<Java::Metadata>(pageCast(selected)->selectedVersion()));
->setEnabled(!!std::dynamic_pointer_cast<Java::Metadata>(pageCast(container->selectedPage())->selectedVersion()));
} }
void InstallDialog::done(int result) void InstallDialog::done(int result)

2
launcher/ui/java/InstallJavaDialog.h
View File

@ -37,7 +37,7 @@ class InstallDialog final : public QDialog, private BasePageProvider {
QList<BasePage*> getPages() override; QList<BasePage*> getPages() override;
QString dialogTitle() override; QString dialogTitle() override;
void validate(); void validate(BasePage* selected);
void done(int result) override; void done(int result) override;
private: private: