diff options
| author | Petr Mrázek <peterix@users.noreply.github.com> | 2021-06-21 00:46:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-21 00:46:16 +0200 |
| commit | 8179a89103833805d5374399d80a4305be1b8355 (patch) | |
| tree | f36faf74f7dff04c0f636a1a0653d704e8b3eea1 /application/pages | |
| parent | bace6fec1ba7f2fc044b0218e4c2b56dd94767b9 (diff) | |
| parent | e439ce6e0b8bed288a5a821ed5db80e42dd71e03 (diff) | |
| download | PrismLauncher-8179a89103833805d5374399d80a4305be1b8355.tar.gz PrismLauncher-8179a89103833805d5374399d80a4305be1b8355.tar.bz2 PrismLauncher-8179a89103833805d5374399d80a4305be1b8355.zip | |
Merge pull request #3886 from phit/fixftblegacy
NOISSUE Fix FTB Legacy Pack Selection
Diffstat (limited to 'application/pages')
4 files changed, 9 insertions, 4 deletions
diff --git a/application/pages/modplatform/atlauncher/AtlPage.cpp b/application/pages/modplatform/atlauncher/AtlPage.cpp index 1b61ebd0..3c19804f 100644 --- a/application/pages/modplatform/atlauncher/AtlPage.cpp +++ b/application/pages/modplatform/atlauncher/AtlPage.cpp @@ -20,6 +20,9 @@ AtlPage::AtlPage(NewInstanceDialog* dialog, QWidget *parent) ui->packView->header()->hide(); ui->packView->setIndentation(0); + ui->versionSelectionBox->view()->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300); + for(int i = 0; i < filterModel->getAvailableSortings().size(); i++) { ui->sortByBox->addItem(filterModel->getAvailableSortings().keys().at(i)); diff --git a/application/pages/modplatform/flame/FlamePage.cpp b/application/pages/modplatform/flame/FlamePage.cpp index 2dd58e16..ade58431 100644 --- a/application/pages/modplatform/flame/FlamePage.cpp +++ b/application/pages/modplatform/flame/FlamePage.cpp @@ -17,9 +17,8 @@ FlamePage::FlamePage(NewInstanceDialog* dialog, QWidget *parent) listModel = new Flame::ListModel(this); ui->packView->setModel(listModel); - ui->versionSelectionBox->setMaxVisibleItems(10); - // fix height for themes that dont respect max visible like fusion - ui->versionSelectionBox->setStyleSheet("combobox-popup: 0;"); + ui->versionSelectionBox->view()->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300); // index is used to set the sorting with the curseforge api ui->sortByBox->addItem(tr("Sort by featured")); diff --git a/application/pages/modplatform/ftb/FtbPage.cpp b/application/pages/modplatform/ftb/FtbPage.cpp index b49982d5..b7f35c5d 100644 --- a/application/pages/modplatform/ftb/FtbPage.cpp +++ b/application/pages/modplatform/ftb/FtbPage.cpp @@ -23,6 +23,9 @@ FtbPage::FtbPage(NewInstanceDialog* dialog, QWidget *parent) ui->searchEdit->installEventFilter(this); + ui->versionSelectionBox->view()->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + ui->versionSelectionBox->view()->parentWidget()->setMaximumHeight(300); + for(int i = 0; i < filterModel->getAvailableSortings().size(); i++) { ui->sortByBox->addItem(filterModel->getAvailableSortings().keys().at(i)); diff --git a/application/pages/modplatform/legacy_ftb/Page.cpp b/application/pages/modplatform/legacy_ftb/Page.cpp index 3bcc42c1..a438f76c 100644 --- a/application/pages/modplatform/legacy_ftb/Page.cpp +++ b/application/pages/modplatform/legacy_ftb/Page.cpp @@ -127,7 +127,7 @@ void Page::suggestCurrent() return; } - if(!selected.broken || !selectedVersion.isEmpty()) + if(selected.broken || selectedVersion.isEmpty()) { dialog->setSuggestedPack(); return; |