lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix always using BMCLAPIDownloadProvider

Browse Source
This commit is contained in:
huangyuhui
2018-07-21 20:24:54 +08:00
parent bac265a077
commit 7b619fef1d
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HMCL/src/main/java/org/jackhuang/hmcl/ui/VersionItem.java
View File

@@ -71,7 +71,7 @@ public final class VersionItem extends StackPane {
private void initializeComponents() { private void initializeComponents() {
setPickOnBounds(false); setPickOnBounds(false);
FXUtils.setLimitWidth(this, 160); FXUtils.setLimitWidth(this, 160);
FXUtils.setLimitHeight(this, 156); FXUtils.setLimitHeight(this, 149);
content = new VBox(); content = new VBox();
{ {

4
HMCL/src/main/java/org/jackhuang/hmcl/ui/download/InstallerWizardProvider.java
View File

@@ -20,6 +20,7 @@ package org.jackhuang.hmcl.ui.download;
import javafx.scene.Node; import javafx.scene.Node;
import org.jackhuang.hmcl.download.BMCLAPIDownloadProvider; import org.jackhuang.hmcl.download.BMCLAPIDownloadProvider;
import org.jackhuang.hmcl.download.DownloadProvider;
import org.jackhuang.hmcl.download.RemoteVersion; import org.jackhuang.hmcl.download.RemoteVersion;
import org.jackhuang.hmcl.game.Version; import org.jackhuang.hmcl.game.Version;
import org.jackhuang.hmcl.setting.Profile; import org.jackhuang.hmcl.setting.Profile;
@@ -100,9 +101,10 @@ public final class InstallerWizardProvider implements WizardProvider {
@Override @Override
public Node createPage(WizardController controller, int step, Map<String, Object> settings) { public Node createPage(WizardController controller, int step, Map<String, Object> settings) {
DownloadProvider provider = profile.getDependency().getDownloadProvider();
switch (step) { switch (step) {
case 0: case 0:
return new AdditionalInstallersPage(this, controller, profile.getRepository(), BMCLAPIDownloadProvider.INSTANCE); return new AdditionalInstallersPage(this, controller, profile.getRepository(), provider);
default: default:
throw new IllegalStateException(); throw new IllegalStateException();
} }

2
HMCL/src/main/resources/assets/fxml/main.fxml
View File

@@ -13,7 +13,7 @@
<JFXSpinner fx:id="spinner" styleClass="first-spinner" /> <JFXSpinner fx:id="spinner" styleClass="first-spinner" />
<StackPane fx:id="contentPane"> <StackPane fx:id="contentPane">
<ScrollPane fitToWidth="true" fx:id="scrollPane" hbarPolicy="NEVER"> <ScrollPane fitToWidth="true" fx:id="scrollPane" hbarPolicy="NEVER">
<JFXMasonryPane fx:id="masonryPane" HSpacing="3" VSpacing="3" cellWidth="182" cellHeight="160"> <JFXMasonryPane fx:id="masonryPane" HSpacing="3" VSpacing="3" cellWidth="182" cellHeight="153">
</JFXMasonryPane> </JFXMasonryPane>
</ScrollPane> </ScrollPane>
<VBox style="-fx-padding: 15;" spacing="15" pickOnBounds="false" alignment="BOTTOM_RIGHT"> <VBox style="-fx-padding: 15;" spacing="15" pickOnBounds="false" alignment="BOTTOM_RIGHT">